Merge branch 'master' into observable2call

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/remote/adapters/ServerAdapter.java
#	app/src/main/java/it/niedermann/nextcloud/deck/remote/api/DeckAPI.java
#	app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/providers/AttachmentDataProvider.java

6 files changed, 11 insertions, 13 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 261e03263..a3a3e74e7 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
@@ -272,8 +272,8 @@ public class ServerAdapter {
         this.requestHelper.request(() -> provider.getDeckAPI().downloadAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback);
     }
 
-    public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull ResponseCallback<Void> responseCallback) {
-        this.requestHelper.request(() -> provider.getDeckAPI().deleteAttachment(remoteBoardId, remoteStackId, remoteCardId, remoteAttachmentId), responseCallback);
+    public void deleteAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, @NonNull Attachment attachment, @NonNull ResponseCallback<Void> responseCallback) {
+        this.requestHelper.request(() -> provider.getDeckAPI().deleteAttachment(attachment.getType().getValue(), remoteBoardId, remoteStackId, remoteCardId, attachment.getId()), responseCallback);
     }
 
     public void restoreAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, long remoteAttachmentId, @NonNull ResponseCallback<Attachment> 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 b6a35c926..f9d9b310a 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
@@ -158,7 +158,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(@Path("boardId") long boardId, @Path("stackId") long stackId, @Path("cardId") long cardId, @Path("attachmentId") long attachmentId);
+    Call<Void> 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);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java
index 1167fb7e2..4da2707f4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java
@@ -48,8 +48,7 @@ public abstract class ResponseCallback<T> implements IResponseCallback<T> {
     }
 
     private boolean isListOfRemoteEntity(T response) {
-        if (response instanceof List) {
-            final var collection = (List<?>) response;
+        if (response instanceof List<?> collection) {
             return collection.size() > 0 && collection.get(0) instanceof AbstractRemoteEntity;
         }
         return false;
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 4251d9a05..639e57998 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
@@ -17,7 +17,7 @@ import it.niedermann.nextcloud.deck.remote.helpers.SyncHelper;
 public abstract class AbstractSyncDataProvider<T extends IRemoteEntity> {
 
     @Nullable
-    protected AbstractSyncDataProvider<?> parent;
+    protected final AbstractSyncDataProvider<?> parent;
     protected final List<AbstractSyncDataProvider<?>> children = new ArrayList<>();
     protected boolean stillGoingDeeper = false;
 
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 db02a6fc6..646e89bf3 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
@@ -22,10 +22,10 @@ import it.niedermann.nextcloud.deck.remote.api.ResponseCallback;
 
 public class AttachmentDataProvider extends AbstractSyncDataProvider<Attachment> {
 
-    private FullCard card;
-    private Board board;
-    private Stack stack;
-    private List<Attachment> attachments;
+    private final FullCard card;
+    private final Board board;
+    private final Stack stack;
+    private final List<Attachment> attachments;
 
     public AttachmentDataProvider(AbstractSyncDataProvider<?> parent, Board board, Stack stack, FullCard card, List<Attachment> attachments) {
         super(parent);
@@ -118,7 +118,7 @@ public class AttachmentDataProvider extends AbstractSyncDataProvider<Attachment>
 
     @Override
     public void deleteOnServer(ServerAdapter serverAdapter, long accountId, ResponseCallback<Void> callback, Attachment entity, DataBaseAdapter dataBaseAdapter) {
-        serverAdapter.deleteAttachment(board.getId(), stack.getId(), card.getId(), entity.getId(), callback);
+        serverAdapter.deleteAttachment(board.getId(), stack.getId(), card.getId(), entity, callback);
     }
 
     @Override
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 a690eb471..667c25eb3 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
@@ -105,8 +105,7 @@ public class StackDataProvider extends AbstractSyncDataProvider<FullStack> {
             // so we can just skip this one and proceed with cards.
             return Collections.emptyList();
         }
-        List<FullStack> changedStacks = dataBaseAdapter.getLocallyChangedStacksForBoard(accountId, board.getLocalId());
-        return changedStacks;
+        return dataBaseAdapter.getLocallyChangedStacksForBoard(accountId, board.getLocalId());
     }
 
     @Override