diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers')
9 files changed, 24 insertions, 23 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java index f67c0f107..41accd486 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java @@ -45,7 +45,7 @@ public class DataPropagationHelper { entity.setLocalId(newID); if (serverAdapter.hasInternetConnection()) { try { - provider.createOnServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<T>(callback.getAccount()) { + provider.createOnServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<>(callback.getAccount()) { @Override public void onResponse(T response) { executor.submit(() -> { @@ -85,7 +85,7 @@ public class DataPropagationHelper { } if (entity.getId() != null && serverAdapter.hasInternetConnection()) { try { - provider.updateOnServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<T>(new Account(accountId)) { + provider.updateOnServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<>(new Account(accountId)) { @Override public void onResponse(T response) { executor.submit(() -> { @@ -114,7 +114,7 @@ public class DataPropagationHelper { provider.deleteInDB(dataBaseAdapter, accountId, entity); if (entity.getId() != null && serverAdapter.hasInternetConnection()) { try { - provider.deleteOnServer(serverAdapter, accountId, new ResponseCallback<Void>(new Account(accountId)) { + provider.deleteOnServer(serverAdapter, accountId, new ResponseCallback<>(new Account(accountId)) { @Override public void onResponse(Void response) { executor.submit(() -> { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java index a334d05fe..b58d0bf9c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java @@ -44,7 +44,7 @@ public class SyncHelper { // Sync Server -> App public <T extends IRemoteEntity> void doSyncFor(@NonNull final AbstractSyncDataProvider<T> provider) { provider.registerChildInParent(provider); - provider.getAllFromServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<List<T>>(account) { + provider.getAllFromServer(serverAdapter, dataBaseAdapter, accountId, new ResponseCallback<>(account) { @Override public void onResponse(List<T> response) { if (response != null) { @@ -134,7 +134,7 @@ public class SyncHelper { } private <T extends IRemoteEntity> ResponseCallback<Void> getDeleteCallback(@NonNull AbstractSyncDataProvider<T> provider, T entity) { - return new ResponseCallback<Void>(account) { + return new ResponseCallback<>(account) { @Override public void onResponse(Void response) { provider.deletePhysicallyInDB(dataBaseAdapter, accountId, entity); @@ -150,7 +150,7 @@ public class SyncHelper { } private <T extends IRemoteEntity> ResponseCallback<T> getUpdateCallback(@NonNull AbstractSyncDataProvider<T> provider, @NonNull T entity, @Nullable CountDownLatch countDownLatch) { - return new ResponseCallback<T>(account) { + return new ResponseCallback<>(account) { @Override public void onResponse(T response) { response.setAccountId(this.account.getId()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java index 1288ca66a..55cb5514b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java @@ -35,7 +35,7 @@ public class AccessControlDataProvider extends AbstractSyncDataProvider<AccessCo AsyncUtil.awaitAsyncWork(acl.size(), latch -> { for (AccessControl accessControl : acl) { if (TYPE_GROUP.equals(accessControl.getType())) { - serverAdapter.searchGroupMembers(accessControl.getUser().getUid(), new ResponseCallback<GroupMemberUIDs>(responder.getAccount()) { + serverAdapter.searchGroupMembers(accessControl.getUser().getUid(), new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(GroupMemberUIDs response) { accessControl.setGroupMemberUIDs(response); @@ -64,7 +64,7 @@ public class AccessControlDataProvider extends AbstractSyncDataProvider<AccessCo User user = dataBaseAdapter.getUserByUidDirectly(account.getId(), uid); if (user == null) { // unknown user. fetch! - serverAdapter.getSingleUserData(uid, new ResponseCallback<OcsUser>(account) { + serverAdapter.getSingleUserData(uid, new ResponseCallback<>(account) { @Override public void onResponse(OcsUser response) { DeckLog.log(response); @@ -106,7 +106,7 @@ public class AccessControlDataProvider extends AbstractSyncDataProvider<AccessCo } private void handleGroupMemberships(DataBaseAdapter dataBaseAdapter, AccessControl entity) { - if (entity.getType() != TYPE_GROUP) { + if (!TYPE_GROUP.equals(entity.getType())) { return; } dataBaseAdapter.deleteGroupMembershipsOfGroup(entity.getUser().getLocalId()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java index 2aae97c37..41091b4a4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java @@ -68,7 +68,7 @@ public class AttachmentDataProvider extends AbstractSyncDataProvider<Attachment> @Override public void createOnServer(ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, long accountId, ResponseCallback<Attachment> responder, Attachment entity) { File file = new File(entity.getLocalPath()); - serverAdapter.uploadAttachment(board.getId(), stack.getId(), card.getId(), file, new ResponseCallback<Attachment>(responder.getAccount()) { + serverAdapter.uploadAttachment(board.getId(), stack.getId(), card.getId(), file, new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(Attachment response) { if (file.delete()) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java index 88e93db68..7a710733d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardDataProvider.java @@ -51,7 +51,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { } List<FullCard> result = Collections.synchronizedList(new ArrayList<>()); for (Card card : stack.getCards()) { - serverAdapter.getCard(board.getId(), stack.getId(), card.getId(), new ResponseCallback<FullCard>(responder.getAccount()) { + serverAdapter.getCard(board.getId(), stack.getId(), card.getId(), new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(FullCard response) { result.add(response); @@ -171,7 +171,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { CardUpdate update = toCardUpdate(entity); update.setStackId(stack.getId()); // https://github.com/stefan-niedermann/nextcloud-deck/issues/787 resolve archiving-conflict - serverAdapter.updateCard(board.getId(), stack.getId(), update, new ResponseCallback<FullCard>(callback.getAccount()) { + serverAdapter.updateCard(board.getId(), stack.getId(), update, new ResponseCallback<>(callback.getAccount()) { @Override public void onResponse(FullCard response) { callback.onResponse(response); @@ -249,7 +249,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { if (changedLabel.getLabelId() == null || changedLabel.getCardId() == null) { dataBaseAdapter.deleteJoinedLabelForCardPhysicallyByRemoteIDs(account.getId(), changedLabel.getCardId(), changedLabel.getLabelId()); } else { - serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), changedLabel.getCardId(), changedLabel.getLabelId(), new ResponseCallback<Void>(account) { + serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), changedLabel.getCardId(), changedLabel.getLabelId(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { dataBaseAdapter.deleteJoinedLabelForCardPhysicallyByRemoteIDs(account.getId(), changedLabel.getCardId(), changedLabel.getLabelId()); @@ -261,7 +261,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { // Sync next time, the card should be available on server then. continue; } else { - serverAdapter.assignLabelToCard(board.getId(), stack.getId(), changedLabel.getCardId(), changedLabel.getLabelId(), new ResponseCallback<Void>(account) { + serverAdapter.assignLabelToCard(board.getId(), stack.getId(), changedLabel.getCardId(), changedLabel.getLabelId(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { Label label = dataBaseAdapter.getLabelByRemoteIdDirectly(account.getId(), changedLabel.getLabelId()); @@ -305,14 +305,14 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { } User user = dataBaseAdapter.getUserByLocalIdDirectly(changedUser.getUserId()); if (changedUser.getStatusEnum() == DBStatus.LOCAL_DELETED) { - serverAdapter.unassignUserFromCard(board.getId(), stack.getId(), changedUser.getCardId(), user.getUid(), new ResponseCallback<Void>(account) { + serverAdapter.unassignUserFromCard(board.getId(), stack.getId(), changedUser.getCardId(), user.getUid(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { dataBaseAdapter.deleteJoinedUserForCardPhysicallyByRemoteIDs(account.getId(), changedUser.getCardId(), user.getUid()); } }); } else if (changedUser.getStatusEnum() == DBStatus.LOCAL_EDITED) { - serverAdapter.assignUserToCard(board.getId(), stack.getId(), changedUser.getCardId(), user.getUid(), new ResponseCallback<Void>(account) { + serverAdapter.assignUserToCard(board.getId(), stack.getId(), changedUser.getCardId(), user.getUid(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { dataBaseAdapter.setStatusForJoinCardWithUser(card.getLocalId(), user.getLocalId(), DBStatus.UP_TO_DATE.getId()); @@ -358,7 +358,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { } if (cardToDelete.getStatus() == DBStatus.LOCAL_MOVED.getId()) { //only delete, if the card isn't availible on server anymore. - serverAdapter.getCard(board.getId(), stack.getId(), cardToDelete.getId(), new ResponseCallback<FullCard>(new Account(accountId)) { + serverAdapter.getCard(board.getId(), stack.getId(), cardToDelete.getId(), new ResponseCallback<>(new Account(accountId)) { @Override public void onResponse(FullCard response) { // do not delete, it's still there and was just moved! diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardPropagationDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardPropagationDataProvider.java index 5163b8601..1b3914319 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardPropagationDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/CardPropagationDataProvider.java @@ -22,7 +22,7 @@ public class CardPropagationDataProvider extends CardDataProvider { public void createOnServer(ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, long accountId, ResponseCallback<FullCard> responder, FullCard entity) { // make sure, all ancestors are synced properly if (board.getId() == null) { - serverAdapter.createBoard(board, new ResponseCallback<FullBoard>(responder.getAccount()) { + serverAdapter.createBoard(board, new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(FullBoard response) { board.setId(response.getId()); @@ -37,7 +37,7 @@ public class CardPropagationDataProvider extends CardDataProvider { } }); } else if (stack.getId() == null) { - serverAdapter.createStack(board, stack.getStack(), new ResponseCallback<FullStack>(responder.getAccount()) { + serverAdapter.createStack(board, stack.getStack(), new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(FullStack response) { stack.setId(response.getId()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/DeckCommentsDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/DeckCommentsDataProvider.java index 5240c4770..9d7ee4c70 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/DeckCommentsDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/DeckCommentsDataProvider.java @@ -3,6 +3,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.helpers.providers; import java.time.Instant; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import it.niedermann.nextcloud.deck.DeckLog; @@ -25,14 +26,14 @@ public class DeckCommentsDataProvider extends AbstractSyncDataProvider<OcsCommen @Override public void getAllFromServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<List<OcsComment>> responder, Instant lastSync) { - serverAdapter.getCommentsForRemoteCardId(card.getId(), new ResponseCallback<OcsComment>(responder.getAccount()) { + serverAdapter.getCommentsForRemoteCardId(card.getId(), new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(OcsComment response) { if (response == null) { response = new OcsComment(); } List<OcsComment> comments = response.split(); - Collections.sort(comments, (o1, o2) -> o1.getSingle().getCreationDateTime().compareTo(o2.getSingle().getCreationDateTime())); + Collections.sort(comments, Comparator.comparing(o -> o.getSingle().getCreationDateTime())); verifyCommentListIntegrity(comments); responder.onResponse(comments); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java index 23f63c12f..9bfeba8cd 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java @@ -57,7 +57,7 @@ public class LabelDataProvider extends AbstractSyncDataProvider<Label> { } private ResponseCallback<Label> getLabelUniqueHandler(DataBaseAdapter dataBaseAdapter, Label entitiy, ResponseCallback<Label> responder) { - return new ResponseCallback<Label>(responder.getAccount()) { + return new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(Label response) { responder.onResponse(response); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/OcsProjectDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/OcsProjectDataProvider.java index bbd324092..ccbb01530 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/OcsProjectDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/OcsProjectDataProvider.java @@ -24,7 +24,7 @@ public class OcsProjectDataProvider extends AbstractSyncDataProvider<OcsProject> @Override public void getAllFromServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<List<OcsProject>> responder, Instant lastSync) { - serverAdapter.getProjectsForCard(card.getId(), new ResponseCallback<OcsProjectList>(responder.getAccount()) { + serverAdapter.getProjectsForCard(card.getId(), new ResponseCallback<>(responder.getAccount()) { @Override public void onResponse(OcsProjectList response) { responder.onResponse(response.getProjects()); |