Cleanup: Switch names of IResponseCallback and ResponseCallback

Signed-off-by: Stefan Niedermann <info@niedermann.it>

2 files changed, 43 insertions, 42 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
index 0cbdd7bb1..8304b5733 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java
@@ -20,8 +20,8 @@ import java.util.List;
 
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.api.ApiProvider;
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.api.RequestHelper;
+import it.niedermann.nextcloud.deck.api.ResponseCallback;
 import it.niedermann.nextcloud.deck.exceptions.OfflineException;
 import it.niedermann.nextcloud.deck.model.AccessControl;
 import it.niedermann.nextcloud.deck.model.Account;
@@ -34,6 +34,7 @@ import it.niedermann.nextcloud.deck.model.enums.EAttachmentType;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullStack;
+import it.niedermann.nextcloud.deck.model.ocs.Activity;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
 import it.niedermann.nextcloud.deck.model.ocs.comment.OcsComment;
@@ -112,7 +113,7 @@ public class ServerAdapter {
 //        return lastSyncHeader;
     }
 
-    public void getBoards(@NonNull IResponseCallback<ParsedResponse<List<FullBoard>>> responseCallback) {
+    public void getBoards(@NonNull ResponseCallback<ParsedResponse<List<FullBoard>>> responseCallback) {
         RequestHelper.request(provider, () -> isEtagsEnabled()
                 ? provider.getDeckAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId()), responseCallback.getAccount().getBoardsEtag())
                 : provider.getDeckAPI().getBoards(true, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
@@ -122,94 +123,94 @@ public class ServerAdapter {
         return sharedPreferences.getBoolean(prefKeyEtags, true);
     }
 
-    public void getCapabilities(String eTag, @NonNull IResponseCallback<ParsedResponse<Capabilities>> responseCallback) {
+    public void getCapabilities(String eTag, @NonNull ResponseCallback<ParsedResponse<Capabilities>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getCapabilities(eTag), responseCallback);
     }
 
-    public void getProjectsForCard(long remoteCardId, @NonNull IResponseCallback<OcsProjectList> responseCallback) {
+    public void getProjectsForCard(long remoteCardId, @NonNull ResponseCallback<OcsProjectList> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getProjectsForCard(remoteCardId), responseCallback);
     }
 
-    public void searchUser(String searchTerm, @NonNull IResponseCallback<OcsUserList> responseCallback) {
+    public void searchUser(String searchTerm, @NonNull ResponseCallback<OcsUserList> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().searchUser(searchTerm), responseCallback);
     }
 
-    public void getSingleUserData(String userUid, @NonNull IResponseCallback<OcsUser> responseCallback) {
+    public void getSingleUserData(String userUid, @NonNull ResponseCallback<OcsUser> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getSingleUserData(userUid), responseCallback);
     }
 
-    public void searchGroupMembers(String groupUID, @NonNull IResponseCallback<GroupMemberUIDs> responseCallback) {
+    public void searchGroupMembers(String groupUID, @NonNull ResponseCallback<GroupMemberUIDs> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().searchGroupMembers(groupUID), responseCallback);
     }
 
-    public void getActivitiesForCard(long cardId, @NonNull IResponseCallback<List<it.niedermann.nextcloud.deck.model.ocs.Activity>> responseCallback) {
+    public void getActivitiesForCard(long cardId, @NonNull ResponseCallback<List<Activity>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getActivitiesForCard(cardId), responseCallback);
     }
 
-    public void createBoard(Board board, @NonNull IResponseCallback<FullBoard> responseCallback) {
+    public void createBoard(Board board, @NonNull ResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createBoard(board), responseCallback);
     }
 
-    public void deleteBoard(Board board, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteBoard(Board board, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteBoard(board.getId()), responseCallback);
     }
 
-    public void updateBoard(Board board, @NonNull IResponseCallback<FullBoard> responseCallback) {
+    public void updateBoard(Board board, @NonNull ResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateBoard(board.getId(), board), responseCallback);
     }
 
-    public void createAccessControl(long remoteBoardId, AccessControl acl, @NonNull IResponseCallback<AccessControl> responseCallback) {
+    public void createAccessControl(long remoteBoardId, AccessControl acl, @NonNull ResponseCallback<AccessControl> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createAccessControl(remoteBoardId, acl), responseCallback);
     }
 
-    public void updateAccessControl(long remoteBoardId, AccessControl acl, @NonNull IResponseCallback<AccessControl> responseCallback) {
+    public void updateAccessControl(long remoteBoardId, AccessControl acl, @NonNull ResponseCallback<AccessControl> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateAccessControl(remoteBoardId, acl.getId(), acl), responseCallback);
     }
 
-    public void deleteAccessControl(long remoteBoardId, AccessControl acl, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteAccessControl(long remoteBoardId, AccessControl acl, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteAccessControl(remoteBoardId, acl.getId(), acl), responseCallback);
     }
 
-    public void getStacks(long boardId, @NonNull IResponseCallback<List<FullStack>> responseCallback) {
+    public void getStacks(long boardId, @NonNull ResponseCallback<List<FullStack>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().getStacks(boardId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
-    public void getStack(long boardId, long stackId, @NonNull IResponseCallback<FullStack> responseCallback) {
+    public void getStack(long boardId, long stackId, @NonNull ResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().getStack(boardId, stackId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
-    public void createStack(Board board, Stack stack, @NonNull IResponseCallback<FullStack> responseCallback) {
+    public void createStack(Board board, Stack stack, @NonNull ResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createStack(board.getId(), stack), responseCallback);
     }
 
-    public void deleteStack(Board board, Stack stack, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteStack(Board board, Stack stack, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteStack(board.getId(), stack.getId()), responseCallback);
 
     }
 
-    public void updateStack(Board board, Stack stack, @NonNull IResponseCallback<FullStack> responseCallback) {
+    public void updateStack(Board board, Stack stack, @NonNull ResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateStack(board.getId(), stack.getId(), stack), responseCallback);
 
     }
 
-    public void getCard(long boardId, long stackId, long cardId, @NonNull IResponseCallback<FullCard> responseCallback) {
+    public void getCard(long boardId, long stackId, long cardId, @NonNull ResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> {
             final Account account = responseCallback.getAccount();
@@ -220,37 +221,37 @@ public class ServerAdapter {
         }, responseCallback);
     }
 
-    public void createCard(long boardId, long stackId, Card card, @NonNull IResponseCallback<FullCard> responseCallback) {
+    public void createCard(long boardId, long stackId, Card card, @NonNull ResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createCard(boardId, stackId, card), responseCallback);
     }
 
-    public void deleteCard(long boardId, long stackId, Card card, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteCard(long boardId, long stackId, Card card, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteCard(boardId, stackId, card.getId()), responseCallback);
     }
 
-    public void updateCard(long boardId, long stackId, CardUpdate card, @NonNull IResponseCallback<FullCard> responseCallback) {
+    public void updateCard(long boardId, long stackId, CardUpdate card, @NonNull ResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateCard(boardId, stackId, card.getId(), card), responseCallback);
     }
 
-    public void assignUserToCard(long boardId, long stackId, long cardId, String userUID, @NonNull IResponseCallback<Void> responseCallback) {
+    public void assignUserToCard(long boardId, long stackId, long cardId, String userUID, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().assignUserToCard(boardId, stackId, cardId, userUID), responseCallback);
     }
 
-    public void unassignUserFromCard(long boardId, long stackId, long cardId, String userUID, @NonNull IResponseCallback<Void> responseCallback) {
+    public void unassignUserFromCard(long boardId, long stackId, long cardId, String userUID, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().unassignUserFromCard(boardId, stackId, cardId, userUID), responseCallback);
     }
 
-    public void assignLabelToCard(long boardId, long stackId, long cardId, long labelId, @NonNull IResponseCallback<Void> responseCallback) {
+    public void assignLabelToCard(long boardId, long stackId, long cardId, long labelId, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().assignLabelToCard(boardId, stackId, cardId, labelId), responseCallback);
     }
 
-    public void unassignLabelFromCard(long boardId, long stackId, long cardId, long labelId, @NonNull IResponseCallback<Void> responseCallback) {
+    public void unassignLabelFromCard(long boardId, long stackId, long cardId, long labelId, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().unassignLabelFromCard(boardId, stackId, cardId, labelId), responseCallback);
     }
@@ -258,22 +259,22 @@ public class ServerAdapter {
 
     // Labels
 
-    public void createLabel(long boardId, Label label, @NonNull IResponseCallback<Label> responseCallback) {
+    public void createLabel(long boardId, Label label, @NonNull ResponseCallback<Label> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createLabel(boardId, label), responseCallback);
     }
 
-    public void deleteLabel(long boardId, Label label, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteLabel(long boardId, Label label, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteLabel(boardId, label.getId()), responseCallback);
     }
 
-    public void updateLabel(long boardId, Label label, @NonNull IResponseCallback<Label> responseCallback) {
+    public void updateLabel(long boardId, Label label, @NonNull ResponseCallback<Label> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateLabel(boardId, label.getId(), label), responseCallback);
     }
 
-    public void reorder(long boardId, long currentStackId, long cardId, long newStackId, int newPosition, @NonNull IResponseCallback<List<FullCard>> responseCallback) {
+    public void reorder(long boardId, long currentStackId, long cardId, long newStackId, int newPosition, @NonNull ResponseCallback<List<FullCard>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().moveCard(boardId, currentStackId, cardId, new Reorder(newPosition, (int) newStackId)), responseCallback);
     }
@@ -281,7 +282,7 @@ public class ServerAdapter {
 
     // Attachments
 
-    public void uploadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, File attachment, @NonNull IResponseCallback<Attachment> responseCallback) {
+    public void uploadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, File attachment, @NonNull ResponseCallback<Attachment> responseCallback) {
         ensureInternetConnection();
         final Account account = responseCallback.getAccount();
         final String type = account.getServerDeckVersionAsObject().supportsFileAttachments()
@@ -306,7 +307,7 @@ public class ServerAdapter {
         return type;
     }
 
-    public void updateAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, String contentType, Uri attachmentUri, @NonNull IResponseCallback<Attachment> responseCallback) {
+    public void updateAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, String contentType, Uri attachmentUri, @NonNull ResponseCallback<Attachment> responseCallback) {
         ensureInternetConnection();
         final File attachment = new File(attachmentUri.getPath());
         final String type = responseCallback.getAccount().getServerDeckVersionAsObject().supportsFileAttachments()
@@ -317,37 +318,37 @@ public class ServerAdapter {
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId, typePart, filePart), responseCallback);
     }
 
-    public void downloadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull IResponseCallback<ResponseBody> responseCallback) {
+    public void downloadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull ResponseCallback<ResponseBody> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().downloadAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback);
     }
 
-    public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback);
     }
 
-    public void restoreAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull IResponseCallback<Attachment> responseCallback) {
+    public void restoreAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull ResponseCallback<Attachment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().restoreAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback);
     }
 
-    public void getCommentsForRemoteCardId(Long remoteCardId, @NonNull IResponseCallback<OcsComment> responseCallback) {
+    public void getCommentsForRemoteCardId(Long remoteCardId, @NonNull ResponseCallback<OcsComment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getCommentsForCard(remoteCardId), responseCallback);
     }
 
-    public void createCommentForCard(DeckComment comment, @NonNull IResponseCallback<OcsComment> responseCallback) {
+    public void createCommentForCard(DeckComment comment, @NonNull ResponseCallback<OcsComment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().createCommentForCard(comment.getObjectId(), comment), responseCallback);
     }
 
-    public void updateCommentForCard(DeckComment comment, @NonNull IResponseCallback<OcsComment> responseCallback) {
+    public void updateCommentForCard(DeckComment comment, @NonNull ResponseCallback<OcsComment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().updateCommentForCard(comment.getObjectId(), comment.getId(), comment), responseCallback);
     }
 
-    public void deleteCommentForCard(DeckComment comment, @NonNull IResponseCallback<Void> responseCallback) {
+    public void deleteCommentForCard(DeckComment comment, @NonNull ResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().deleteCommentForCard(comment.getObjectId(), comment.getId()), responseCallback);
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/UserSearchLiveData.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/UserSearchLiveData.java
index 179d816eb..3d05247b3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/UserSearchLiveData.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/UserSearchLiveData.java
@@ -5,7 +5,7 @@ import androidx.lifecycle.MediatorLiveData;
 import java.util.List;
 
 import it.niedermann.nextcloud.deck.DeckLog;
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
+import it.niedermann.nextcloud.deck.api.ResponseCallback;
 import it.niedermann.nextcloud.deck.exceptions.OfflineException;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.User;
@@ -52,7 +52,7 @@ public class UserSearchLiveData extends MediatorLiveData<List<User>> implements
         if (server.hasInternetConnection()) {
             try {
                 Account account = db.getAccountByIdDirectly(accountId);
-                server.searchUser(term, new IResponseCallback<OcsUserList>(account) {
+                server.searchUser(term, new ResponseCallback<OcsUserList>(account) {
                     @Override
                     public void onResponse(OcsUserList response) {
                         if (response == null || response.getUsers().isEmpty()){