diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync')
13 files changed, 53 insertions, 54 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java index d2fc568df..c0002c43f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java @@ -141,7 +141,7 @@ public class SyncManager { CountDownLatch latch = new CountDownLatch(accounts.size()); try { for (Account account : accounts) { - new SyncManager(dataBaseAdapter.getContext(), account.getName()).synchronize(new ResponseCallback<Boolean>(account) { + new SyncManager(dataBaseAdapter.getContext(), account.getName()).synchronize(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { success.set(success.get() && Boolean.TRUE.equals(response)); @@ -206,7 +206,7 @@ public class SyncManager { throw new IllegalArgumentException(Account.class.getSimpleName() + " object in given " + ResponseCallback.class.getSimpleName() + " must contain a valid id, but given id was null."); } executor.submit(() -> { - refreshCapabilities(new ResponseCallback<Capabilities>(responseCallback.getAccount()) { + refreshCapabilities(new ResponseCallback<>(responseCallback.getAccount()) { @Override public void onResponse(Capabilities response) { if (response != null && !response.isMaintenanceEnabled()) { @@ -216,10 +216,10 @@ public class SyncManager { final SyncHelper syncHelper = syncHelperFactory.create(serverAdapter, dataBaseAdapter, lastSyncDate); - ResponseCallback<Boolean> callback = new ResponseCallback<Boolean>(callbackAccount) { + ResponseCallback<Boolean> callback = new ResponseCallback<>(callbackAccount) { @Override public void onResponse(Boolean response) { - syncHelper.setResponseCallback(new ResponseCallback<Boolean>(account) { + syncHelper.setResponseCallback(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { LastSyncUtil.setLastSyncDate(accountId, Instant.now()); @@ -388,7 +388,7 @@ public class SyncManager { executor.submit(() -> { for (Account account : accounts) { syncHelperFactory.create(serverAdapter, dataBaseAdapter, null) - .setResponseCallback(new ResponseCallback<Boolean>(account) { + .setResponseCallback(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { liveData.postValue(dataBaseAdapter.readAccountsForHostWithReadAccessToBoardDirectly(host, boardRemoteId)); @@ -406,7 +406,7 @@ public class SyncManager { return executor.submit(() -> { try { Account accountForEtag = dataBaseAdapter.getAccountByIdDirectly(callback.getAccount().getId()); - serverAdapter.getCapabilities(accountForEtag.getEtag(), new ResponseCallback<ParsedResponse<Capabilities>>(callback.getAccount()) { + serverAdapter.getCapabilities(accountForEtag.getEtag(), new ResponseCallback<>(callback.getAccount()) { @Override public void onResponse(ParsedResponse<Capabilities> response) { Account acc = dataBaseAdapter.getAccountByIdDirectly(account.getId()); @@ -657,7 +657,7 @@ public class SyncManager { serverAdapterToUse = new ServerAdapter(appContext, targetAccount.getName()); } syncHelperFactory.create(serverAdapterToUse, dataBaseAdapter, null) - .setResponseCallback(new ResponseCallback<Boolean>(targetAccount) { + .setResponseCallback(new ResponseCallback<>(targetAccount) { @Override public void onResponse(Boolean response) { callback.onResponse(dataBaseAdapter.getFullBoardByLocalIdDirectly(targetAccountId, newBoardId)); @@ -681,7 +681,7 @@ public class SyncManager { if (serverAdapter.hasInternetConnection()) { if (card.getId() != null) { syncHelperFactory.create(serverAdapter, dataBaseAdapter, null) - .setResponseCallback(new ResponseCallback<Boolean>(dataBaseAdapter.getAccountByIdDirectly(card.getAccountId())) { + .setResponseCallback(new ResponseCallback<>(dataBaseAdapter.getAccountByIdDirectly(card.getAccountId())) { @Override public void onResponse(Boolean response) { // do nothing @@ -701,7 +701,7 @@ public class SyncManager { Account account = dataBaseAdapter.getAccountByIdDirectly(accountId); Card card = dataBaseAdapter.getCardByLocalIdDirectly(accountId, cardId); OcsComment commentEntity = OcsComment.of(comment); - new DataPropagationHelper(serverAdapter, dataBaseAdapter, executor).createEntity(new DeckCommentsDataProvider(null, card), commentEntity, new ResponseCallback<OcsComment>(account) { + new DataPropagationHelper(serverAdapter, dataBaseAdapter, executor).createEntity(new DeckCommentsDataProvider(null, card), commentEntity, new ResponseCallback<>(account) { @Override public void onResponse(OcsComment response) { // nothing so far @@ -718,7 +718,7 @@ public class SyncManager { DeckComment entity = dataBaseAdapter.getCommentByLocalIdDirectly(accountId, localCommentId); entity.setMessage(comment); OcsComment commentEntity = OcsComment.of(entity); - new DataPropagationHelper(serverAdapter, dataBaseAdapter, executor).updateEntity(new DeckCommentsDataProvider(null, card), commentEntity, new ResponseCallback<OcsComment>(account) { + new DataPropagationHelper(serverAdapter, dataBaseAdapter, executor).updateEntity(new DeckCommentsDataProvider(null, card), commentEntity, new ResponseCallback<>(account) { @Override public void onResponse(OcsComment response) { // nothing so far @@ -814,7 +814,7 @@ public class SyncManager { Account account = dataBaseAdapter.getAccountByIdDirectly(entity.getAccountId()); FullBoard board = dataBaseAdapter.getFullBoardByLocalIdDirectly(entity.getAccountId(), entity.getBoardId()); new DataPropagationHelper(serverAdapter, dataBaseAdapter, executor).deleteEntity( - new AccessControlDataProvider(null, board, Collections.singletonList(entity)), entity, new ResponseCallback<Void>(account) { + new AccessControlDataProvider(null, board, Collections.singletonList(entity)), entity, new ResponseCallback<>(account) { @Override public void onResponse(Void response) { // revoked own board-access? @@ -1020,7 +1020,7 @@ public class SyncManager { if (serverAdapter.hasInternetConnection()) { syncHelperFactory.create(serverAdapter, dataBaseAdapter, null) - .setResponseCallback(new ResponseCallback<Boolean>(account) { + .setResponseCallback(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { callback.onResponse(card); @@ -1101,7 +1101,7 @@ public class SyncManager { continue; } card.getCard().setArchived(true); - updateCardForArchive(stack, board, card, new ResponseCallback<FullCard>(account) { + updateCardForArchive(stack, board, card, new ResponseCallback<>(account) { @Override public void onResponse(FullCard response) { latch.countDown(); @@ -1185,7 +1185,7 @@ public class SyncManager { if (serverAdapter.hasInternetConnection()) { Account account = dataBaseAdapter.getAccountByIdDirectly(card.getAccountId()); syncHelperFactory.create(serverAdapter, dataBaseAdapter, null) - .setResponseCallback(new ResponseCallback<Boolean>(account) { + .setResponseCallback(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { callback.onResponse(dataBaseAdapter.getFullCardByLocalIdDirectly(card.getAccountId(), card.getLocalId())); @@ -1263,7 +1263,7 @@ public class SyncManager { if (originAccountId != targetAccountId) { serverToUse = new ServerAdapter(appContext, targetAccount.getName()); } - new DataPropagationHelper(serverToUse, dataBaseAdapter, executor).createEntity(new CardPropagationDataProvider(null, targetBoard.getBoard(), targetFullStack), fullCardForServerPropagation, new ResponseCallback<FullCard>(targetAccount) { + new DataPropagationHelper(serverToUse, dataBaseAdapter, executor).createEntity(new CardPropagationDataProvider(null, targetBoard.getBoard(), targetFullStack), fullCardForServerPropagation, new ResponseCallback<>(targetAccount) { @Override public void onResponse(FullCard response) { originalInnerCard.setId(response.getId()); @@ -1380,7 +1380,7 @@ public class SyncManager { Account account = dataBaseAdapter.getAccountByIdDirectly(accountId); Board board = dataBaseAdapter.getBoardByLocalCardIdDirectly(localCardId); label.setAccountId(accountId); - new DataPropagationHelper(serverAdapterToUse, dataBaseAdapter, executor).createEntity(new LabelDataProvider(null, board, null), label, new ResponseCallback<Label>(account) { + new DataPropagationHelper(serverAdapterToUse, dataBaseAdapter, executor).createEntity(new LabelDataProvider(null, board, null), label, new ResponseCallback<>(account) { @Override public void onResponse(Label response) { assignLabelToCard(response, dataBaseAdapter.getCardByLocalIdDirectly(accountId, localCardId)); @@ -1392,9 +1392,7 @@ public class SyncManager { super.onError(throwable); assignLabelToCard(label, dataBaseAdapter.getCardByLocalIdDirectly(accountId, localCardId)); } - }, (entity, response) -> { - response.setBoardId(board.getLocalId()); - }); + }, (entity, response) -> response.setBoardId(board.getLocalId())); }); return liveData; } @@ -1433,7 +1431,7 @@ public class SyncManager { Board board = dataBaseAdapter.getBoardByLocalIdDirectly(stack.getBoardId()); Account account = dataBaseAdapter.getAccountByIdDirectly(card.getAccountId()); if (serverAdapter.hasInternetConnection()) { - serverAdapter.assignUserToCard(board.getId(), stack.getId(), card.getId(), user.getUid(), new ResponseCallback<Void>(account) { + serverAdapter.assignUserToCard(board.getId(), stack.getId(), card.getId(), user.getUid(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { @@ -1462,7 +1460,7 @@ public class SyncManager { Board board = dataBaseAdapter.getBoardByLocalIdDirectly(stack.getBoardId()); Account account = dataBaseAdapter.getAccountByIdDirectly(card.getAccountId()); if (serverAdapterToUse.hasInternetConnection()) { - serverAdapterToUse.assignLabelToCard(board.getId(), stack.getId(), card.getId(), label.getId(), new ResponseCallback<Void>(account) { + serverAdapterToUse.assignLabelToCard(board.getId(), stack.getId(), card.getId(), label.getId(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { @@ -1481,7 +1479,7 @@ public class SyncManager { Board board = dataBaseAdapter.getBoardByLocalIdDirectly(stack.getBoardId()); Account account = dataBaseAdapter.getAccountByIdDirectly(card.getAccountId()); if (serverAdapter.hasInternetConnection()) { - serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), card.getId(), label.getId(), new ResponseCallback<Void>(account) { + serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), card.getId(), label.getId(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { dataBaseAdapter.deleteJoinedLabelForCardPhysically(card.getLocalId(), label.getLocalId()); @@ -1499,7 +1497,7 @@ public class SyncManager { Stack stack = dataBaseAdapter.getStackByLocalIdDirectly(card.getStackId()); Board board = dataBaseAdapter.getBoardByLocalIdDirectly(stack.getBoardId()); Account account = dataBaseAdapter.getAccountByIdDirectly(card.getAccountId()); - serverAdapter.unassignUserFromCard(board.getId(), stack.getId(), card.getId(), user.getUid(), new ResponseCallback<Void>(account) { + serverAdapter.unassignUserFromCard(board.getId(), stack.getId(), card.getId(), user.getUid(), new ResponseCallback<>(account) { @Override public void onResponse(Void response) { dataBaseAdapter.deleteJoinedUserForCardPhysically(card.getLocalId(), user.getLocalId()); @@ -1651,7 +1649,7 @@ public class SyncManager { Stack stack = dataBaseAdapter.getStackByLocalIdDirectly(movedCard.getCard().getStackId()); FullBoard board = dataBaseAdapter.getFullBoardByLocalIdDirectly(accountId, stack.getBoardId()); Account account = dataBaseAdapter.getAccountByIdDirectly(movedCard.getCard().getAccountId()); - syncHelperFactory.create(serverAdapter, dataBaseAdapter, Instant.now()).setResponseCallback(new ResponseCallback<Boolean>(account) { + syncHelperFactory.create(serverAdapter, dataBaseAdapter, Instant.now()).setResponseCallback(new ResponseCallback<>(account) { @Override public void onResponse(Boolean response) { // doNothing(); @@ -1775,7 +1773,7 @@ public class SyncManager { Board board = dataBaseAdapter.getBoardByLocalIdDirectly(stack.getBoardId()); Account account = dataBaseAdapter.getAccountByIdDirectly(card.getAccountId()); new DataPropagationHelper(serverAdapter, dataBaseAdapter, executor) - .updateEntity(new AttachmentDataProvider(null, board, stack, card, Collections.singletonList(attachment)), attachment, new ResponseCallback<Attachment>(account) { + .updateEntity(new AttachmentDataProvider(null, board, stack, card, Collections.singletonList(attachment)), attachment, new ResponseCallback<>(account) { @Override public void onResponse(Attachment response) { liveData.postValue(response); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java index 397d1339f..af503b029 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java @@ -1,5 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util; +import static androidx.lifecycle.Transformations.distinctUntilChanged; + import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; @@ -9,8 +11,6 @@ import androidx.lifecycle.Observer; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static androidx.lifecycle.Transformations.distinctUntilChanged; - public class LiveDataHelper { private LiveDataHelper() { @@ -39,7 +39,7 @@ public class LiveDataHelper { } public static <I> MediatorLiveData<I> of(I oneShot) { - return new MediatorLiveData<I>() { + return new MediatorLiveData<>() { @Override public void observe(@NonNull LifecycleOwner owner, @NonNull Observer observer) { super.observe(owner, observer); @@ -55,7 +55,7 @@ public class LiveDataHelper { } public static <T> void observeOnce(LiveData<T> liveData, LifecycleOwner owner, Observer<T> observer) { - final Observer<T> tempObserver = new Observer<T>() { + final Observer<T> tempObserver = new Observer<>() { @Override public void onChanged(T result) { liveData.removeObserver(this); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/Debouncer.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/Debouncer.java index fca4ca369..b9fa58b7d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/Debouncer.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/extrawurst/Debouncer.java @@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit; public class Debouncer <T> { private final ScheduledExecutorService sched = Executors.newScheduledThreadPool(1); - private final ConcurrentHashMap<T, TimerTask> delayedMap = new ConcurrentHashMap<T, TimerTask>(); + private final ConcurrentHashMap<T, TimerTask> delayedMap = new ConcurrentHashMap<>(); private final Callback<T> callback; private final int interval; 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 4a90664c9..e0f546399 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 @@ -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 ResponseCallback<OcsUserList>(account) { + server.searchUser(term, new ResponseCallback<>(account) { @Override public void onResponse(OcsUserList response) { if (response == null || response.getUsers().isEmpty()){ 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()); |