Merge pull request #2207 from nextcloud/backport/2206/stable-4.3

[stable-4.3] fix: Move to EmptyResponse instead off now unsupported Void

Author: AndyScherzinger

app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI.java

@@ -12,6 +12,7 @@
 import androidx.annotation.Nullable;
 
 import com.google.gson.annotations.Expose;
+import com.nextcloud.android.sso.api.EmptyResponse;
 import com.nextcloud.android.sso.api.NextcloudAPI;
 import com.nextcloud.android.sso.api.ParsedResponse;
 
@@ -119,7 +120,7 @@ public Call<Note> editNote(@NonNull Note note) {
         }
     }
 
-    public Call<Void> deleteNote(long noteId) {
+    public Call<EmptyResponse> deleteNote(long noteId) {
         if (ApiVersion.API_VERSION_1_0.equals(usedApiVersion)) {
             return notesAPI_1_0.deleteNote(noteId);
         } else if (ApiVersion.API_VERSION_0_2.equals(usedApiVersion)) {

app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI_0_2.java

@@ -6,6 +6,7 @@
  */
 package it.niedermann.owncloud.notes.persistence.sync;
 
+import com.nextcloud.android.sso.api.EmptyResponse;
 import com.nextcloud.android.sso.api.ParsedResponse;
 
 import java.util.List;
@@ -43,5 +44,5 @@ public interface NotesAPI_0_2 {
     Call<Note> editNote(@Body NotesAPI.Note_0_2 note, @Path("remoteId") long remoteId);
 
     @DELETE("notes/{remoteId}")
-    Call<Void> deleteNote(@Path("remoteId") long noteId);
+    Call<EmptyResponse> deleteNote(@Path("remoteId") long noteId);
 }

app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/NotesAPI_1_0.java

@@ -6,6 +6,7 @@
  */
 package it.niedermann.owncloud.notes.persistence.sync;
 
+import com.nextcloud.android.sso.api.EmptyResponse;
 import com.nextcloud.android.sso.api.ParsedResponse;
 
 import java.util.List;
@@ -44,7 +45,7 @@ public interface NotesAPI_1_0 {
     Call<Note> editNote(@Body Note note, @Path("remoteId") long remoteId);
 
     @DELETE("notes/{remoteId}")
-    Call<Void> deleteNote(@Path("remoteId") long noteId);
+    Call<EmptyResponse> deleteNote(@Path("remoteId") long noteId);
 
     @GET("settings")
     Call<NotesSettings> getSettings();