diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java | 48 |
1 files changed, 23 insertions, 25 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); |