Migrate gotify to new client
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
package com.github.gotify;
|
||||
|
||||
import com.github.gotify.api.Api;
|
||||
import com.github.gotify.api.ApiException;
|
||||
import com.github.gotify.api.Callback;
|
||||
import com.github.gotify.client.ApiClient;
|
||||
import com.github.gotify.client.ApiException;
|
||||
import com.github.gotify.client.api.MessageApi;
|
||||
import com.github.gotify.client.model.Message;
|
||||
import com.github.gotify.client.model.PagedMessages;
|
||||
@@ -12,26 +11,30 @@ import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import static com.github.gotify.api.Callback.call;
|
||||
|
||||
public class MissedMessageUtil {
|
||||
static final int NO_MESSAGES = 0;
|
||||
|
||||
private final MessageApi api;
|
||||
|
||||
public MissedMessageUtil(ApiClient client) {
|
||||
api = new MessageApi(client);
|
||||
public MissedMessageUtil(MessageApi api) {
|
||||
this.api = api;
|
||||
}
|
||||
|
||||
public void lastReceivedMessage(Callback.SuccessCallback<Integer> successCallback) {
|
||||
Api.<PagedMessages>withLogging((cb) -> api.getMessagesAsync(1, 0, cb))
|
||||
.handle(
|
||||
(messages) -> {
|
||||
if (messages.getMessages().size() == 1) {
|
||||
successCallback.onSuccess(messages.getMessages().get(0).getId());
|
||||
} else {
|
||||
successCallback.onSuccess(NO_MESSAGES);
|
||||
}
|
||||
},
|
||||
(e) -> {});
|
||||
api.getMessages(1, 0)
|
||||
.enqueue(
|
||||
call(
|
||||
(messages) -> {
|
||||
if (messages.getMessages().size() == 1) {
|
||||
successCallback.onSuccess(
|
||||
messages.getMessages().get(0).getId());
|
||||
} else {
|
||||
successCallback.onSuccess(NO_MESSAGES);
|
||||
}
|
||||
},
|
||||
(e) -> {}));
|
||||
}
|
||||
|
||||
public List<Message> missingMessages(int till) {
|
||||
@@ -40,7 +43,7 @@ public class MissedMessageUtil {
|
||||
|
||||
Integer since = null;
|
||||
while (true) {
|
||||
PagedMessages pagedMessages = api.getMessages(10, since);
|
||||
PagedMessages pagedMessages = Api.execute(api.getMessages(10, since));
|
||||
List<Message> messages = pagedMessages.getMessages();
|
||||
List<Message> filtered = filter(messages, till);
|
||||
result.addAll(filtered);
|
||||
|
||||
Reference in New Issue
Block a user