refactor: Move packages to clarify architecture

https://developer.android.com/topic/architecture

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

9 files changed, 31 insertions, 31 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditCardViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditCardViewModel.java
index 7a553f80c..2d2eb585f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditCardViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditCardViewModel.java
@@ -23,7 +23,6 @@ import it.niedermann.android.reactivelivedata.ReactiveLiveData;
 import it.niedermann.android.sharedpreferences.SharedPreferenceBooleanLiveData;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Attachment;
 import it.niedermann.nextcloud.deck.model.Board;
@@ -33,13 +32,14 @@ import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.full.FullCardWithProjects;
 import it.niedermann.nextcloud.deck.model.ocs.Activity;
-import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
+import it.niedermann.nextcloud.deck.remote.api.IResponseCallback;
+import it.niedermann.nextcloud.deck.repository.SyncRepository;
 import it.niedermann.nextcloud.deck.ui.viewmodel.BaseViewModel;
 
 @SuppressWarnings("WeakerAccess")
 public class EditCardViewModel extends BaseViewModel {
 
-    private SyncManager syncManager;
+    private SyncRepository syncRepository;
     private Account account;
     private long boardId;
     private FullCardWithProjects originalCard;
@@ -115,7 +115,7 @@ public class EditCardViewModel extends BaseViewModel {
 
     public void setAccount(@NonNull Account account) throws NextcloudFilesAppAccountNotFoundException {
         this.account = account;
-        this.syncManager = new SyncManager(getApplication(), account);
+        this.syncRepository = new SyncRepository(getApplication(), account);
         hasCommentsAbility = account.getServerDeckVersionAsObject().supportsComments();
     }
 
@@ -168,7 +168,7 @@ public class EditCardViewModel extends BaseViewModel {
     }
 
     public void createLabel(long accountId, Label label, long localBoardId, @NonNull IResponseCallback<Label> callback) {
-        syncManager.createLabel(accountId, label, localBoardId, callback);
+        syncRepository.createLabel(accountId, label, localBoardId, callback);
     }
 
     public LiveData<FullCardWithProjects> getFullCardWithProjectsByLocalId(long accountId, long cardLocalId) {
@@ -179,19 +179,19 @@ public class EditCardViewModel extends BaseViewModel {
      * Saves the current {@link #fullCard}. If it is a new card, it will be created, otherwise it will be updated.
      */
     public void saveCard(@NonNull IResponseCallback<FullCard> callback) {
-        syncManager.updateCard(getFullCard(), callback);
+        syncRepository.updateCard(getFullCard(), callback);
     }
 
     public LiveData<List<Activity>> syncActivitiesForCard(@NonNull Card card) {
-        return syncManager.syncActivitiesForCard(card);
+        return syncRepository.syncActivitiesForCard(card);
     }
 
     public void addAttachmentToCard(long accountId, long localCardId, @NonNull String mimeType, @NonNull File file, @NonNull IResponseCallback<Attachment> callback) {
-        syncManager.addAttachmentToCard(accountId, localCardId, mimeType, file, callback);
+        syncRepository.addAttachmentToCard(accountId, localCardId, mimeType, file, callback);
     }
 
     public void deleteAttachmentOfCard(long accountId, long localCardId, long localAttachmentId, @NonNull IResponseCallback<Void> callback) {
-        syncManager.deleteAttachmentOfCard(accountId, localCardId, localAttachmentId, callback);
+        syncRepository.deleteAttachmentOfCard(accountId, localCardId, localAttachmentId, callback);
     }
 
     public LiveData<Card> getCardByRemoteID(long accountId, long remoteId) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
index decca0630..0af489781 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
@@ -44,14 +44,14 @@ public class LabelAutoCompleteAdapter extends AutoCompleteAdapter<Label> {
         final String[] colors = activity.getResources().getStringArray(R.array.board_default_colors);
         createLabelColor = Color.parseColor(colors[new Random().nextInt(colors.length)]);
 
-        canManage$ = new ReactiveLiveData<>(syncManager.getFullBoardById(account.getId(), boardId))
+        canManage$ = new ReactiveLiveData<>(syncRepository.getFullBoardById(account.getId(), boardId))
                 .map(FullBoard::getBoard)
                 .map(Board::isPermissionManage);
 
         constraint$
                 .flatMap(constraint -> TextUtils.isEmpty(constraint)
-                        ? syncManager.findProposalsForLabelsToAssign(account.getId(), boardId, cardId)
-                        : syncManager.searchNotYetAssignedLabelsByTitle(account, boardId, cardId, constraint))
+                        ? syncRepository.findProposalsForLabelsToAssign(account.getId(), boardId, cardId)
+                        : syncRepository.searchNotYetAssignedLabelsByTitle(account, boardId, cardId, constraint))
                 .map(this::filterExcluded)
                 .flatMap(this::addCreateLabelIfNeeded)
                 .distinctUntilChanged()
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardViewModel.java
index 517c2267c..61de92a07 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/NewCardViewModel.java
@@ -14,11 +14,11 @@ import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundExce
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Card;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.model.ocs.Version;
+import it.niedermann.nextcloud.deck.remote.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.ui.viewmodel.SyncViewModel;
 
 public class NewCardViewModel extends SyncViewModel {
@@ -35,7 +35,7 @@ public class NewCardViewModel extends SyncViewModel {
         final var result = new CompletableFuture<FullCard>();
 
         supplyAsync(() -> baseRepository.readAccountDirectly(accountId))
-                .thenAcceptAsync(account -> syncManager.createFullCard(accountId, boardId, stackId, createFullCard(account.getServerDeckVersionAsObject(), content),
+                .thenAcceptAsync(account -> syncRepository.createFullCard(accountId, boardId, stackId, createFullCard(account.getServerDeckVersionAsObject(), content),
                         new IResponseCallback<>() {
                             @Override
                             public void onResponse(FullCard response) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
index 34a1bc177..11012bb75 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java
@@ -50,19 +50,19 @@ public class UserAutoCompleteAdapter extends AutoCompleteAdapter<User> {
                 .debounce(300)
                 .observe(activity, constraint -> {
                     DeckLog.verbose("Triggering remote search");
-                    syncManager.triggerUserSearch(account, constraint);
+                    syncRepository.triggerUserSearch(account, constraint);
                 });
 
         if (cardId == NO_CARD) {
             // No card means this adapter is used for searching users for Board ACL
             results$ = constraint$.flatMap(constraint -> TextUtils.isEmpty(constraint)
-                    ? syncManager.findProposalsForUsersToAssignForACL(account.getId(), boardId, activity.getResources().getInteger(R.integer.max_users_suggested))
-                    : syncManager.searchUserByUidOrDisplayNameForACL(account.getId(), boardId, constraint));
+                    ? syncRepository.findProposalsForUsersToAssignForACL(account.getId(), boardId, activity.getResources().getInteger(R.integer.max_users_suggested))
+                    : syncRepository.searchUserByUidOrDisplayNameForACL(account.getId(), boardId, constraint));
         } else {
             // Card is given, so we are searching for users to assign to a card (limited to users whom the board is shared with)
             results$ = constraint$.flatMap(constraint -> TextUtils.isEmpty(constraint)
-                    ? syncManager.findProposalsForUsersToAssignForCards(account.getId(), boardId, cardId, activity.getResources().getInteger(R.integer.max_users_suggested))
-                    : syncManager.searchUserByUidOrDisplayNameForCards(account.getId(), boardId, cardId, constraint));
+                    ? syncRepository.findProposalsForUsersToAssignForCards(account.getId(), boardId, cardId, activity.getResources().getInteger(R.integer.max_users_suggested))
+                    : syncRepository.searchUserByUidOrDisplayNameForCards(account.getId(), boardId, cardId, constraint));
         }
 
         results$
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
index 61dc3e8ee..96292ecff 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@@ -64,13 +64,13 @@ import it.niedermann.android.reactivelivedata.ReactiveLiveData;
 import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabAttachmentsBinding;
 import it.niedermann.nextcloud.deck.exceptions.UploadAttachmentFailedException;
 import it.niedermann.nextcloud.deck.model.Attachment;
 import it.niedermann.nextcloud.deck.model.Card;
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
-import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
+import it.niedermann.nextcloud.deck.remote.api.IResponseCallback;
+import it.niedermann.nextcloud.deck.repository.SyncRepository;
 import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
 import it.niedermann.nextcloud.deck.ui.card.attachments.picker.AbstractPickerAdapter;
 import it.niedermann.nextcloud.deck.ui.card.attachments.picker.ContactAdapter;
@@ -500,7 +500,7 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet
 
                 @Override
                 public void onError(Throwable throwable) {
-                    if (SyncManager.isNoOnVoidError(throwable)) {
+                    if (SyncRepository.isNoOnVoidError(throwable)) {
                         IResponseCallback.super.onError(throwable);
                         requireActivity().runOnUiThread(() -> ExceptionDialogFragment.newInstance(throwable, editViewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName()));
                     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
index 9a7822bb2..254765a0a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
@@ -26,12 +26,12 @@ import java.time.Instant;
 import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabCommentsBinding;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
 import it.niedermann.nextcloud.deck.model.ocs.comment.full.FullDeckComment;
-import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
+import it.niedermann.nextcloud.deck.remote.api.IResponseCallback;
+import it.niedermann.nextcloud.deck.repository.SyncRepository;
 import it.niedermann.nextcloud.deck.ui.card.EditActivity;
 import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment;
@@ -177,7 +177,7 @@ public class CardCommentsFragment extends Fragment implements CommentEditedListe
 
             @Override
             public void onError(Throwable throwable) {
-                if (SyncManager.isNoOnVoidError(throwable)) {
+                if (SyncRepository.isNoOnVoidError(throwable)) {
                     IResponseCallback.super.onError(throwable);
                     requireActivity().runOnUiThread(() -> ExceptionDialogFragment.newInstance(throwable, editCardViewModel.getAccount()).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName()));
                 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
index 5b5dead49..c41420147 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java
@@ -23,7 +23,7 @@ import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.User;
-import it.niedermann.nextcloud.deck.persistence.BaseRepository;
+import it.niedermann.nextcloud.deck.repository.BaseRepository;
 import it.niedermann.nextcloud.deck.ui.card.comments.util.CommentsUtil;
 
 public class CardCommentsMentionProposer implements TextWatcher {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java
index 5918c9b41..79b0043fe 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CommentsViewModel.java
@@ -12,10 +12,10 @@ import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundExce
 
 import java.util.List;
 
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.ocs.comment.DeckComment;
 import it.niedermann.nextcloud.deck.model.ocs.comment.full.FullDeckComment;
+import it.niedermann.nextcloud.deck.remote.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.ui.viewmodel.SyncViewModel;
 
 @SuppressWarnings("WeakerAccess")
@@ -40,14 +40,14 @@ public class CommentsViewModel extends SyncViewModel {
     }
 
     public void addCommentToCard(long accountId, long cardId, @NonNull DeckComment comment) {
-        syncManager.addCommentToCard(accountId, cardId, comment);
+        syncRepository.addCommentToCard(accountId, cardId, comment);
     }
 
     public void updateComment(long accountId, long localCardId, long localCommentId, String comment) {
-        syncManager.updateComment(accountId, localCardId, localCommentId, comment);
+        syncRepository.updateComment(accountId, localCardId, localCommentId, comment);
     }
 
     public void deleteComment(long accountId, long localCardId, long localCommentId, @NonNull IResponseCallback<Void> callback) {
-        syncManager.deleteComment(accountId, localCardId, localCommentId, callback);
+        syncRepository.deleteComment(accountId, localCardId, localCommentId, callback);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
index 04874cee9..49a0b33ae 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java
@@ -46,12 +46,12 @@ import it.niedermann.android.util.ColorUtil;
 import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
-import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabDetailsBinding;
 import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
+import it.niedermann.nextcloud.deck.remote.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
 import it.niedermann.nextcloud.deck.ui.card.LabelAutoCompleteAdapter;
 import it.niedermann.nextcloud.deck.ui.card.UserAutoCompleteAdapter;