Use @NonNull annotations, final modifiers, ...

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

1 files changed, 48 insertions, 62 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 8cadbaec8..0cbdd7bb1 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
@@ -60,10 +60,6 @@ public class ServerAdapter {
     private final Context applicationContext;
     private final ApiProvider provider;
 
-    public ServerAdapter(@NonNull Context applicationContext) {
-        this(applicationContext, null);
-    }
-
     public ServerAdapter(@NonNull Context applicationContext, @Nullable String ssoAccountName) {
         this.applicationContext = applicationContext;
         prefKeyWifiOnly = applicationContext.getResources().getString(R.string.pref_key_wifi_only);
@@ -72,18 +68,6 @@ public class ServerAdapter {
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
     }
 
-    public String getServerUrl() {
-        return provider.getServerUrl();
-    }
-
-    public String getApiPath() {
-        return provider.getApiPath();
-    }
-
-    public String getApiUrl() {
-        return provider.getApiUrl();
-    }
-
     public void ensureInternetConnection() {
         boolean isConnected = hasInternetConnection();
         if (!isConnected) {
@@ -128,7 +112,7 @@ public class ServerAdapter {
 //        return lastSyncHeader;
     }
 
-    public void getBoards(IResponseCallback<ParsedResponse<List<FullBoard>>> responseCallback) {
+    public void getBoards(@NonNull IResponseCallback<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);
@@ -138,166 +122,169 @@ public class ServerAdapter {
         return sharedPreferences.getBoolean(prefKeyEtags, true);
     }
 
-    public void getCapabilities(String eTag, IResponseCallback<ParsedResponse<Capabilities>> responseCallback) {
+    public void getCapabilities(String eTag, @NonNull IResponseCallback<ParsedResponse<Capabilities>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getCapabilities(eTag), responseCallback);
     }
 
-    public void getProjectsForCard(long remoteCardId, IResponseCallback<OcsProjectList> responseCallback) {
+    public void getProjectsForCard(long remoteCardId, @NonNull IResponseCallback<OcsProjectList> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getProjectsForCard(remoteCardId), responseCallback);
     }
 
-    public void searchUser(String searchTerm, IResponseCallback<OcsUserList> responseCallback) {
+    public void searchUser(String searchTerm, @NonNull IResponseCallback<OcsUserList> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().searchUser(searchTerm), responseCallback);
     }
 
-    public void getSingleUserData(String userUid, IResponseCallback<OcsUser> responseCallback) {
+    public void getSingleUserData(String userUid, @NonNull IResponseCallback<OcsUser> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getSingleUserData(userUid), responseCallback);
     }
 
-    public void searchGroupMembers(String groupUID, IResponseCallback<GroupMemberUIDs> responseCallback) {
+    public void searchGroupMembers(String groupUID, @NonNull IResponseCallback<GroupMemberUIDs> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().searchGroupMembers(groupUID), responseCallback);
     }
 
-    public void getActivitiesForCard(long cardId, IResponseCallback<List<it.niedermann.nextcloud.deck.model.ocs.Activity>> responseCallback) {
+    public void getActivitiesForCard(long cardId, @NonNull IResponseCallback<List<it.niedermann.nextcloud.deck.model.ocs.Activity>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getActivitiesForCard(cardId), responseCallback);
     }
 
-    public void createBoard(Board board, IResponseCallback<FullBoard> responseCallback) {
+    public void createBoard(Board board, @NonNull IResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createBoard(board), responseCallback);
     }
 
-
-    public void deleteBoard(Board board, IResponseCallback<Void> responseCallback) {
+    public void deleteBoard(Board board, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteBoard(board.getId()), responseCallback);
     }
 
-    public void updateBoard(Board board, IResponseCallback<FullBoard> responseCallback) {
+    public void updateBoard(Board board, @NonNull IResponseCallback<FullBoard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateBoard(board.getId(), board), responseCallback);
     }
 
-    public void createAccessControl(long remoteBoardId, AccessControl acl, IResponseCallback<AccessControl> responseCallback) {
+    public void createAccessControl(long remoteBoardId, AccessControl acl, @NonNull IResponseCallback<AccessControl> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createAccessControl(remoteBoardId, acl), responseCallback);
     }
 
-    public void updateAccessControl(long remoteBoardId, AccessControl acl, IResponseCallback<AccessControl> responseCallback) {
+    public void updateAccessControl(long remoteBoardId, AccessControl acl, @NonNull IResponseCallback<AccessControl> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateAccessControl(remoteBoardId, acl.getId(), acl), responseCallback);
     }
 
-    public void deleteAccessControl(long remoteBoardId, AccessControl acl, IResponseCallback<Void> responseCallback) {
+    public void deleteAccessControl(long remoteBoardId, AccessControl acl, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteAccessControl(remoteBoardId, acl.getId(), acl), responseCallback);
     }
 
-    public void getStacks(long boardId, IResponseCallback<List<FullStack>> responseCallback) {
+    public void getStacks(long boardId, @NonNull IResponseCallback<List<FullStack>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().getStacks(boardId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
-    public void getStack(long boardId, long stackId, IResponseCallback<FullStack> responseCallback) {
+    public void getStack(long boardId, long stackId, @NonNull IResponseCallback<FullStack> responseCallback) {
+        ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().getStack(boardId, stackId, getLastSyncDateFormatted(responseCallback.getAccount().getId())), responseCallback);
     }
 
-    public void createStack(Board board, Stack stack, IResponseCallback<FullStack> responseCallback) {
+    public void createStack(Board board, Stack stack, @NonNull IResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createStack(board.getId(), stack), responseCallback);
     }
 
-    public void deleteStack(Board board, Stack stack, IResponseCallback<Void> responseCallback) {
+    public void deleteStack(Board board, Stack stack, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteStack(board.getId(), stack.getId()), responseCallback);
 
     }
 
-    public void updateStack(Board board, Stack stack, IResponseCallback<FullStack> responseCallback) {
+    public void updateStack(Board board, Stack stack, @NonNull IResponseCallback<FullStack> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().updateStack(board.getId(), stack.getId(), stack), responseCallback);
 
     }
 
-    public void getCard(long boardId, long stackId, long cardId, IResponseCallback<FullCard> responseCallback) {
+    public void getCard(long boardId, long stackId, long cardId, @NonNull IResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> {
             final Account account = responseCallback.getAccount();
-            if (account != null && account.getServerDeckVersionAsObject().supportsFileAttachments()) {
+            if (account.getServerDeckVersionAsObject().supportsFileAttachments()) {
                 return provider.getDeckAPI().getCard_1_1(boardId, stackId, cardId, getLastSyncDateFormatted(responseCallback.getAccount().getId()));
             }
             return provider.getDeckAPI().getCard_1_0(boardId, stackId, cardId, getLastSyncDateFormatted(responseCallback.getAccount().getId()));
         }, responseCallback);
     }
 
-    public void createCard(long boardId, long stackId, Card card, IResponseCallback<FullCard> responseCallback) {
+    public void createCard(long boardId, long stackId, Card card, @NonNull IResponseCallback<FullCard> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createCard(boardId, stackId, card), responseCallback);
     }
 
-    public void deleteCard(long boardId, long stackId, Card card, IResponseCallback<Void> responseCallback) {
+    public void deleteCard(long boardId, long stackId, Card card, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteCard(boardId, stackId, card.getId()), responseCallback);
     }
 
-    public void updateCard(long boardId, long stackId, CardUpdate card, IResponseCallback<FullCard> responseCallback) {
+    public void updateCard(long boardId, long stackId, CardUpdate card, @NonNull IResponseCallback<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, IResponseCallback<Void> responseCallback) {
+    public void assignUserToCard(long boardId, long stackId, long cardId, String userUID, @NonNull IResponseCallback<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, IResponseCallback<Void> responseCallback) {
+    public void unassignUserFromCard(long boardId, long stackId, long cardId, String userUID, @NonNull IResponseCallback<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, IResponseCallback<Void> responseCallback) {
+    public void assignLabelToCard(long boardId, long stackId, long cardId, long labelId, @NonNull IResponseCallback<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, IResponseCallback<Void> responseCallback) {
+    public void unassignLabelFromCard(long boardId, long stackId, long cardId, long labelId, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().unassignLabelFromCard(boardId, stackId, cardId, labelId), responseCallback);
     }
 
 
-    // ## LABELS
-    public void createLabel(long boardId, Label label, IResponseCallback<Label> responseCallback) {
+    // Labels
+
+    public void createLabel(long boardId, Label label, @NonNull IResponseCallback<Label> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().createLabel(boardId, label), responseCallback);
     }
 
-    public void deleteLabel(long boardId, Label label, IResponseCallback<Void> responseCallback) {
+    public void deleteLabel(long boardId, Label label, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().deleteLabel(boardId, label.getId()), responseCallback);
     }
 
-    public void updateLabel(long boardId, Label label, IResponseCallback<Label> responseCallback) {
+    public void updateLabel(long boardId, Label label, @NonNull IResponseCallback<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, IResponseCallback<List<FullCard>> responseCallback) {
+    public void reorder(long boardId, long currentStackId, long cardId, long newStackId, int newPosition, @NonNull IResponseCallback<List<FullCard>> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().moveCard(boardId, currentStackId, cardId, new Reorder(newPosition, (int) newStackId)), responseCallback);
     }
 
-    // ## ATTACHMENTS
-    public void uploadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, File attachment, IResponseCallback<Attachment> responseCallback) {
+
+    // Attachments
+
+    public void uploadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, File attachment, @NonNull IResponseCallback<Attachment> responseCallback) {
         ensureInternetConnection();
         final Account account = responseCallback.getAccount();
-        final String type = (account != null && account.getServerDeckVersionAsObject().supportsFileAttachments())
+        final String type = account.getServerDeckVersionAsObject().supportsFileAttachments()
                 ? EAttachmentType.FILE.getValue()
                 : EAttachmentType.DECK_FILE.getValue();
         final MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", attachment.getName(), RequestBody.create(MediaType.parse(getMimeType(attachment)), attachment));
@@ -319,11 +306,10 @@ public class ServerAdapter {
         return type;
     }
 
-    public void updateAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, String contentType, Uri attachmentUri, IResponseCallback<Attachment> responseCallback) {
+    public void updateAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, String contentType, Uri attachmentUri, @NonNull IResponseCallback<Attachment> responseCallback) {
         ensureInternetConnection();
         final File attachment = new File(attachmentUri.getPath());
-        final Account account = responseCallback.getAccount();
-        final String type = (account != null && account.getServerDeckVersionAsObject().supportsFileAttachments())
+        final String type = responseCallback.getAccount().getServerDeckVersionAsObject().supportsFileAttachments()
                 ? EAttachmentType.FILE.getValue()
                 : EAttachmentType.DECK_FILE.getValue();
         final MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", attachment.getName(), RequestBody.create(MediaType.parse(contentType), attachment));
@@ -331,37 +317,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, IResponseCallback<ResponseBody> responseCallback) {
+    public void downloadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull IResponseCallback<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, IResponseCallback<Void> responseCallback) {
+    public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull IResponseCallback<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, IResponseCallback<Attachment> responseCallback) {
+    public void restoreAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull IResponseCallback<Attachment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getDeckAPI().restoreAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback);
     }
 
-    public void getCommentsForRemoteCardId(Long remoteCardId, IResponseCallback<OcsComment> responseCallback) {
+    public void getCommentsForRemoteCardId(Long remoteCardId, @NonNull IResponseCallback<OcsComment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().getCommentsForCard(remoteCardId), responseCallback);
     }
 
-    public void createCommentForCard(DeckComment comment, IResponseCallback<OcsComment> responseCallback) {
+    public void createCommentForCard(DeckComment comment, @NonNull IResponseCallback<OcsComment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().createCommentForCard(comment.getObjectId(), comment), responseCallback);
     }
 
-    public void updateCommentForCard(DeckComment comment, IResponseCallback<OcsComment> responseCallback) {
+    public void updateCommentForCard(DeckComment comment, @NonNull IResponseCallback<OcsComment> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().updateCommentForCard(comment.getObjectId(), comment.getId(), comment), responseCallback);
     }
 
-    public void deleteCommentForCard(DeckComment comment, IResponseCallback<Void> responseCallback) {
+    public void deleteCommentForCard(DeckComment comment, @NonNull IResponseCallback<Void> responseCallback) {
         ensureInternetConnection();
         RequestHelper.request(provider, () -> provider.getNextcloudAPI().deleteCommentForCard(comment.getObjectId(), comment.getId()), responseCallback);
     }