diff options
author | Stefan Niedermann <info@niedermann.it> | 2024-01-23 13:09:08 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2024-01-23 13:09:08 +0300 |
commit | 148b13ad7f91df5f587e5dd44002b90b1c9fde98 (patch) | |
tree | c5c4ad155a3c6216dcb0181485ffbb7e15f4521d /app/src/main/java/it/niedermann/nextcloud/deck/remote | |
parent | efe798eb068aaeef29851fd2f34b735181c963cf (diff) |
refactor: Use Call<EmptyResponse> in favor of Call<Void> because the latter will be removed in the next SSO version
Refs: https://github.com/nextcloud/Android-SingleSignOn/pull/636
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/remote')
17 files changed, 73 insertions, 42 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/adapters/ServerAdapter.java index a3a3e74e7..4aa43d497 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/adapters/ServerAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/adapters/ServerAdapter.java @@ -10,6 +10,7 @@ import android.webkit.MimeTypeMap; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; +import com.nextcloud.android.sso.api.EmptyResponse; import com.nextcloud.android.sso.model.SingleSignOnAccount; import java.io.File; @@ -132,7 +133,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().createBoard(board), responseCallback); } - public void deleteBoard(Board board, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteBoard(Board board, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().deleteBoard(board.getId()), responseCallback); } @@ -148,7 +149,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().updateAccessControl(remoteBoardId, acl.getId(), acl), responseCallback); } - public void deleteAccessControl(long remoteBoardId, AccessControl acl, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteAccessControl(long remoteBoardId, AccessControl acl, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().deleteAccessControl(remoteBoardId, acl.getId(), acl), responseCallback); } @@ -164,7 +165,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().createStack(board.getId(), stack), responseCallback); } - public void deleteStack(Board board, Stack stack, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteStack(Board board, Stack stack, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().deleteStack(board.getId(), stack.getId()), responseCallback); } @@ -188,7 +189,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().createCard(boardId, stackId, card), responseCallback); } - public void deleteCard(long boardId, long stackId, Card card, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteCard(long boardId, long stackId, Card card, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().deleteCard(boardId, stackId, card.getId()), responseCallback); } @@ -196,19 +197,19 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().updateCard(boardId, stackId, card.getId(), card), responseCallback); } - public void assignUserToCard(long boardId, long stackId, long cardId, String userUID, @NonNull ResponseCallback<Void> responseCallback) { + public void assignUserToCard(long boardId, long stackId, long cardId, String userUID, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().assignUserToCard(boardId, stackId, cardId, userUID), responseCallback); } - public void unassignUserFromCard(long boardId, long stackId, long cardId, String userUID, @NonNull ResponseCallback<Void> responseCallback) { + public void unassignUserFromCard(long boardId, long stackId, long cardId, String userUID, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().unassignUserFromCard(boardId, stackId, cardId, userUID), responseCallback); } - public void assignLabelToCard(long boardId, long stackId, long cardId, long labelId, @NonNull ResponseCallback<Void> responseCallback) { + public void assignLabelToCard(long boardId, long stackId, long cardId, long labelId, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().assignLabelToCard(boardId, stackId, cardId, labelId), responseCallback); } - public void unassignLabelFromCard(long boardId, long stackId, long cardId, long labelId, @NonNull ResponseCallback<Void> responseCallback) { + public void unassignLabelFromCard(long boardId, long stackId, long cardId, long labelId, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().unassignLabelFromCard(boardId, stackId, cardId, labelId), responseCallback); } @@ -219,7 +220,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().createLabel(boardId, label), responseCallback); } - public void deleteLabel(long boardId, Label label, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteLabel(long boardId, Label label, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().deleteLabel(boardId, label.getId()), responseCallback); } @@ -272,7 +273,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getDeckAPI().downloadAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback); } - public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, @NonNull Attachment attachment, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, @NonNull Attachment attachment, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getDeckAPI().deleteAttachment(attachment.getType().getValue(), remoteBoardId, remoteStackId, remoteCardId, attachment.getId()), responseCallback); } @@ -292,7 +293,7 @@ public class ServerAdapter { this.requestHelper.request(() -> provider.getNextcloudAPI().updateCommentForCard(comment.getObjectId(), comment.getId(), comment), responseCallback); } - public void deleteCommentForCard(DeckComment comment, @NonNull ResponseCallback<Void> responseCallback) { + public void deleteCommentForCard(DeckComment comment, @NonNull ResponseCallback<EmptyResponse> responseCallback) { this.requestHelper.request(() -> provider.getNextcloudAPI().deleteCommentForCard(comment.getObjectId(), comment.getId()), responseCallback); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/DeckAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/DeckAPI.java index f9d9b310a..f0187e03d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/DeckAPI.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/DeckAPI.java @@ -1,6 +1,8 @@ package it.niedermann.nextcloud.deck.remote.api; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.util.List; import it.niedermann.nextcloud.deck.model.AccessControl; @@ -52,7 +54,7 @@ public interface DeckAPI { Call<FullBoard> updateBoard(@Path("id") long id, @Body Board board); @DELETE("v1.0/boards/{id}") - Call<Void> deleteBoard(@Path("id") long id); + Call<EmptyResponse> deleteBoard(@Path("id") long id); @DELETE("v1.0/boards/{id}/undo_delete") Call<FullBoard> restoreBoard(@Path("id") long id); @@ -73,7 +75,7 @@ public interface DeckAPI { Call<FullStack> updateStack(@Path("boardId") long boardId, @Path("stackId") long id, @Body Stack stack); @DELETE("v1.0/boards/{boardId}/stacks/{stackId}") - Call<Void> deleteStack(@Path("boardId") long boardId, @Path("stackId") long id); + Call<EmptyResponse> deleteStack(@Path("boardId") long boardId, @Path("stackId") long id); @GET("v1.0/boards/{boardId}/stacks/{stackId}") Call<FullStack> getStack(@Path("boardId") long boardId, @Path("stackId") long id, @Header(MODIFIED_SINCE_HEADER) String lastSync); @@ -95,25 +97,25 @@ public interface DeckAPI { @FormUrlEncoded @PUT("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignLabel") - Call<Void> assignLabelToCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("labelId") long labelId); + Call<EmptyResponse> assignLabelToCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("labelId") long labelId); @FormUrlEncoded @PUT("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/removeLabel") - Call<Void> unassignLabelFromCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("labelId") long labelId); + Call<EmptyResponse> unassignLabelFromCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("labelId") long labelId); @FormUrlEncoded @PUT("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignUser") - Call<Void> assignUserToCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("userId") String userUID); + Call<EmptyResponse> assignUserToCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("userId") String userUID); @FormUrlEncoded @PUT("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser") - Call<Void> unassignUserFromCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("userId") String userUID); + Call<EmptyResponse> unassignUserFromCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Field("userId") String userUID); @PUT("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/reorder") Call<List<FullCard>> moveCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Body Reorder reorder); @DELETE("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}") - Call<Void> deleteCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId); + Call<EmptyResponse> deleteCard(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId); /** * @see <a href="https://github.com/nextcloud/deck/issues/2874">This endpoint does only return {@link Attachment}s of type {@link EAttachmentType.DECK_FILE}</a> @@ -138,7 +140,7 @@ public interface DeckAPI { Call<Label> createLabel(@Path("boardId") long boardId, @Body Label label); @DELETE("v1.0/boards/{boardId}/labels/{labelId}") - Call<Void> deleteLabel(@Path("boardId") long boardId, @Path("labelId") long labelId); + Call<EmptyResponse> deleteLabel(@Path("boardId") long boardId, @Path("labelId") long labelId); // Attachments @@ -158,7 +160,7 @@ public interface DeckAPI { Call<Attachment> updateAttachment(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Path("attachmentId") long attachmentId, @Part MultipartBody.Part type, @Part MultipartBody.Part attachment); @DELETE("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}") - Call<Void> deleteAttachment(@Query("type") String type, @Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Path("attachmentId") long attachmentId); + Call<EmptyResponse> deleteAttachment(@Query("type") String type, @Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Path("attachmentId") long attachmentId); @PUT("v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}/restore") Call<Attachment> restoreAttachment(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Path("attachmentId") long attachmentId); @@ -173,6 +175,6 @@ public interface DeckAPI { Call<AccessControl> updateAccessControl(@Path("boardId") long boardId, @Path("aclId") long aclId, @Body AccessControl acl); @DELETE("v1.0/boards/{boardId}/acl/{aclId}") - Call<Void> deleteAccessControl(@Path("boardId") long boardId, @Path("aclId") long aclId, @Body AccessControl acl); + Call<EmptyResponse> deleteAccessControl(@Path("boardId") long boardId, @Path("aclId") long aclId, @Body AccessControl acl); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/NextcloudServerAPI.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/NextcloudServerAPI.java index d3856ddc6..2fc7d8f8e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/NextcloudServerAPI.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/NextcloudServerAPI.java @@ -1,6 +1,8 @@ package it.niedermann.nextcloud.deck.remote.api; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.util.List; import it.niedermann.nextcloud.deck.model.ocs.Activity; @@ -87,5 +89,5 @@ public interface NextcloudServerAPI { "Content-Type: application/json;charset=utf-8" }) @DELETE("apps/deck/api/v1.0/cards/{cardId}/comments/{commentId}") - Call<Void> deleteCommentForCard(@Path("cardId") long cardId, @Path("commentId") long commentId); + Call<EmptyResponse> deleteCommentForCard(@Path("cardId") long cardId, @Path("commentId") long commentId); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/DataPropagationHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/DataPropagationHelper.java index ac6bdedc2..6b6549ac7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/DataPropagationHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/DataPropagationHelper.java @@ -3,6 +3,8 @@ package it.niedermann.nextcloud.deck.remote.helpers; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.util.concurrent.ExecutorService; import java.util.function.BiConsumer; @@ -109,7 +111,7 @@ public class DataPropagationHelper { } } - public <T extends IRemoteEntity> void deleteEntity(@NonNull final AbstractSyncDataProvider<T> provider, @NonNull T entity, @NonNull ResponseCallback<Void> callback){ + public <T extends IRemoteEntity> void deleteEntity(@NonNull final AbstractSyncDataProvider<T> provider, @NonNull T entity, @NonNull ResponseCallback<EmptyResponse> callback){ final long accountId = callback.getAccount().getId(); // known to server? if (entity.getId() != null) { @@ -122,7 +124,7 @@ public class DataPropagationHelper { try { provider.deleteOnServer(serverAdapter, accountId, new ResponseCallback<>(new Account(accountId)) { @Override - public void onResponse(Void response) { + public void onResponse(EmptyResponse response) { executor.submit(() -> { provider.deletePhysicallyInDB(dataBaseAdapter, accountId, entity); callback.onResponse(null); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java index 8f2697523..ca9a3cb2a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java @@ -7,6 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.gson.Gson; +import com.nextcloud.android.sso.api.EmptyResponse; import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException; import java.net.HttpURLConnection; @@ -176,10 +177,10 @@ public class SyncHelper { } } - private <T extends IRemoteEntity> ResponseCallback<Void> getDeleteCallback(@NonNull AbstractSyncDataProvider<T> provider, T entity) { + private <T extends IRemoteEntity> ResponseCallback<EmptyResponse> getDeleteCallback(@NonNull AbstractSyncDataProvider<T> provider, T entity) { return new ResponseCallback<>(account) { @Override - public void onResponse(Void response) { + public void onResponse(EmptyResponse response) { provider.deletePhysicallyInDB(dataBaseAdapter, accountId, entity); provider.goDeeperForUpSync(SyncHelper.this, serverAdapter, dataBaseAdapter, responseCallback); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java index 639e57998..c34aa73dc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AbstractSyncDataProvider.java @@ -2,6 +2,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import androidx.annotation.Nullable; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -106,7 +108,7 @@ public abstract class AbstractSyncDataProvider<T extends IRemoteEntity> { public abstract void updateOnServer(ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, long accountId, ResponseCallback<T> callback, T entity); - public abstract void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, T entity, DataBaseAdapter dataBaseAdapter); + public abstract void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, T entity, DataBaseAdapter dataBaseAdapter); public void childDone(AbstractSyncDataProvider<?> child, ResponseCallback<Boolean> responseCallback, boolean syncChangedSomething) { removeChild(child); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AccessControlDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AccessControlDataProvider.java index 75d9d510a..1bf744038 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AccessControlDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AccessControlDataProvider.java @@ -2,6 +2,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import androidx.annotation.Nullable; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -184,7 +186,7 @@ public class AccessControlDataProvider extends AbstractSyncDataProvider<AccessCo } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, AccessControl entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, AccessControl entity, DataBaseAdapter dataBaseAdapter) { serverAdapter.deleteAccessControl(board.getBoard().getId(), entity, callback); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/ActivityDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/ActivityDataProvider.java index 018ac0282..b4981bf08 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/ActivityDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/ActivityDataProvider.java @@ -2,6 +2,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import androidx.annotation.NonNull; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.Collections; import java.util.List; @@ -63,7 +65,7 @@ public class ActivityDataProvider extends AbstractSyncDataProvider<Activity> { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, Activity entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, Activity entity, DataBaseAdapter dataBaseAdapter) { // nope. } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java index 646e89bf3..64b2812e1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java @@ -3,6 +3,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import android.annotation.SuppressLint; import android.net.Uri; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.io.File; import java.io.IOException; import java.time.Instant; @@ -117,7 +119,7 @@ public class AttachmentDataProvider extends AbstractSyncDataProvider<Attachment> } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, Attachment entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, Attachment entity, DataBaseAdapter dataBaseAdapter) { serverAdapter.deleteAttachment(board.getId(), stack.getId(), card.getId(), entity, callback); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/BoardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/BoardDataProvider.java index 4e0c8dd8b..62b746f2a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/BoardDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/BoardDataProvider.java @@ -5,6 +5,8 @@ import android.util.Pair; import androidx.lifecycle.MutableLiveData; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -270,7 +272,7 @@ public class BoardDataProvider extends AbstractSyncDataProvider<FullBoard> { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, FullBoard entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, FullBoard entity, DataBaseAdapter dataBaseAdapter) { serverAdapter.deleteBoard(entity.getBoard(), callback); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardDataProvider.java index b67e94f8f..e81413ca0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardDataProvider.java @@ -2,6 +2,7 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import android.annotation.SuppressLint; +import com.nextcloud.android.sso.api.EmptyResponse; import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException; import java.time.Instant; @@ -218,7 +219,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, FullCard entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, FullCard entity, DataBaseAdapter dataBaseAdapter) { serverAdapter.deleteCard(board.getId(), stack.getId(), entity.getCard(), callback); } @@ -270,7 +271,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { } else { serverAdapter.unassignLabelFromCard(board.getId(), stack.getId(), changedLabel.getCardId(), changedLabel.getLabelId(), new ResponseCallback<>(account) { @Override - public void onResponse(Void response) { + public void onResponse(EmptyResponse response) { dataBaseAdapter.deleteJoinedLabelForCardPhysicallyByRemoteIDs(account.getId(), changedLabel.getCardId(), changedLabel.getLabelId()); } }); @@ -285,7 +286,7 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { LABEL_JOINS_IN_SYNC.add(changedLabel); serverAdapter.assignLabelToCard(board.getId(), stack.getId(), changedLabel.getCardId(), changedLabel.getLabelId(), new ResponseCallback<>(account) { @Override - public void onResponse(Void response) { + public void onResponse(EmptyResponse response) { Label label = dataBaseAdapter.getLabelByRemoteIdDirectly(account.getId(), changedLabel.getLabelId()); dataBaseAdapter.setStatusForJoinCardWithLabel(card.getLocalId(), label.getLocalId(), DBStatus.UP_TO_DATE.getId()); LABEL_JOINS_IN_SYNC.remove(changedLabel); @@ -337,14 +338,14 @@ public class CardDataProvider extends AbstractSyncDataProvider<FullCard> { if (changedUser.getStatusEnum() == DBStatus.LOCAL_DELETED) { serverAdapter.unassignUserFromCard(board.getId(), stack.getId(), changedUser.getCardId(), user.getUid(), new ResponseCallback<>(account) { @Override - public void onResponse(Void response) { + public void onResponse(EmptyResponse 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<>(account) { @Override - public void onResponse(Void response) { + public void onResponse(EmptyResponse response) { dataBaseAdapter.setStatusForJoinCardWithUser(card.getLocalId(), user.getLocalId(), DBStatus.UP_TO_DATE.getId()); } }); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardPropagationDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardPropagationDataProvider.java index e9028c685..c91ac9740 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardPropagationDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/CardPropagationDataProvider.java @@ -2,6 +2,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import android.annotation.SuppressLint; +import com.nextcloud.android.sso.api.EmptyResponse; + import it.niedermann.nextcloud.deck.database.DataBaseAdapter; import it.niedermann.nextcloud.deck.model.Board; import it.niedermann.nextcloud.deck.model.Card; @@ -83,7 +85,7 @@ public class CardPropagationDataProvider extends CardDataProvider { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, FullCard entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, FullCard entity, DataBaseAdapter dataBaseAdapter) { serverAdapter.deleteCard(board.getId(), stack.getId(), entity.getCard(), callback); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/DeckCommentsDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/DeckCommentsDataProvider.java index ac88f3219..8840b23a9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/DeckCommentsDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/DeckCommentsDataProvider.java @@ -2,6 +2,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import android.annotation.SuppressLint; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -172,7 +174,7 @@ public class DeckCommentsDataProvider extends AbstractSyncDataProvider<OcsCommen } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, OcsComment entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, OcsComment entity, DataBaseAdapter dataBaseAdapter) { DeckComment comment = entity.getSingle(); comment.setObjectId(card.getId()); serverAdapter.deleteCommentForCard(comment, callback); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/LabelDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/LabelDataProvider.java index 9259391bb..b01ca2b51 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/LabelDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/LabelDataProvider.java @@ -2,6 +2,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; import android.annotation.SuppressLint; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.List; @@ -94,7 +96,7 @@ public class LabelDataProvider extends AbstractSyncDataProvider<Label> { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, Label entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, Label entity, DataBaseAdapter dataBaseAdapter) { serverAdapter.deleteLabel(board.getId(), entity, callback); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/OcsProjectDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/OcsProjectDataProvider.java index 23552f2ed..dd09d1b2e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/OcsProjectDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/OcsProjectDataProvider.java @@ -1,6 +1,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.Collections; import java.util.List; @@ -106,7 +108,7 @@ public class OcsProjectDataProvider extends AbstractSyncDataProvider<OcsProject> } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, OcsProject entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, OcsProject entity, DataBaseAdapter dataBaseAdapter) { // Do Nothing } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java index 667c25eb3..fe9918db6 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/StackDataProvider.java @@ -1,6 +1,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.Collections; import java.util.List; @@ -92,7 +94,7 @@ public class StackDataProvider extends AbstractSyncDataProvider<FullStack> { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, FullStack entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, FullStack entity, DataBaseAdapter dataBaseAdapter) { entity.getStack().setBoardId(board.getId()); serverAdapter.deleteStack(board.getBoard(), entity.getStack(), callback); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/UserDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/UserDataProvider.java index 36e2af2cc..aa6c6563a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/UserDataProvider.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/UserDataProvider.java @@ -1,6 +1,8 @@ package it.niedermann.nextcloud.deck.remote.helpers.providers; +import com.nextcloud.android.sso.api.EmptyResponse; + import java.time.Instant; import java.util.List; @@ -63,7 +65,7 @@ public class UserDataProvider extends AbstractSyncDataProvider<User> { } @Override - public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, User entity, DataBaseAdapter dataBaseAdapter) { + public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<EmptyResponse> callback, User entity, DataBaseAdapter dataBaseAdapter) { //TODO: implement } |