revert unrelated changes

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java

@@ -13,12 +13,16 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.nextcloud.android.sso.api.EmptyResponse;
+import com.nextcloud.android.sso.api.ParsedResponse;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
 
-import java.util.Objects;
+import java.util.Map;
 
+import it.niedermann.owncloud.notes.persistence.sync.OcsAPI;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
+import it.niedermann.owncloud.notes.shared.model.OcsResponse;
+import it.niedermann.owncloud.notes.shared.model.OcsUser;
+import retrofit2.Response;
 
 @WorkerThread
 public class CapabilitiesClient {
@@ -30,8 +34,6 @@ public class CapabilitiesClient {
     @WorkerThread
     public static Capabilities getCapabilities(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount, @Nullable String lastETag, @NonNull ApiProvider apiProvider) throws Throwable {
         final var ocsAPI = apiProvider.getOcsAPI(context, ssoAccount);
-        final var repository = NotesRepository.getInstance(context);
-
         try {
             final var response = ocsAPI.getCapabilities(lastETag).blockingSingle();
             final var capabilities = response.getResponse().ocs.data;
@@ -42,20 +44,16 @@ public static Capabilities getCapabilities(@NonNull Context context, @NonNull Si
                 Log.w(TAG, "Response headers of capabilities are null");
             }
 
+            final var repository = NotesRepository.getInstance(context);
             repository.insertCapabilities(capabilities);
 
             return capabilities;
-        } catch (Throwable t) {
-            if (t instanceof ClassCastException castException && Objects.requireNonNull(castException.getMessage()).contains(EmptyResponse.class.getSimpleName())) {
-                Log.d(TAG, "Server returned empty response - Notes not modified.");
-                return repository.getCapabilities();
-            }
-
-            final var cause = t.getCause();
+        } catch (RuntimeException e) {
+            final var cause = e.getCause();
             if (cause != null) {
                 throw cause;
             } else {
-                throw t;
+                throw e;
             }
         }
     }

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java

@@ -18,7 +18,6 @@
 import androidx.annotation.NonNull;
 
 import com.nextcloud.android.sso.AccountImporter;
-import com.nextcloud.android.sso.api.EmptyResponse;
 import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException;
@@ -34,7 +33,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import it.niedermann.owncloud.notes.BuildConfig;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
@@ -282,11 +280,6 @@ private boolean pullRemoteChanges() {
             return true;
         } catch (Throwable t) {
             final Throwable cause = t.getCause();
-            if (t instanceof ClassCastException castException && Objects.requireNonNull(castException.getMessage()).contains(EmptyResponse.class.getSimpleName())) {
-                Log.d(TAG, "Server returned empty response - Notes not modified.");
-                return true;
-            }
-
             if (t.getClass() == RuntimeException.class && cause != null) {
                 if (cause.getClass() == NextcloudHttpRequestFailedException.class || cause instanceof NextcloudHttpRequestFailedException) {
                     final NextcloudHttpRequestFailedException httpException = (NextcloudHttpRequestFailedException) cause;

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

@@ -17,8 +17,6 @@
 import com.google.gson.JsonParseException;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
 
 import it.niedermann.android.util.ColorUtil;
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
@@ -91,19 +89,9 @@ public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializat
             if (capabilities.has(CAPABILITIES_NOTES)) {
                 final var notes = capabilities.getAsJsonObject(CAPABILITIES_NOTES);
                 if (notes.has(CAPABILITIES_NOTES_API_VERSION)) {
-                    final var apiVersionElem = notes.get(CAPABILITIES_NOTES_API_VERSION);
-                    if (apiVersionElem.isJsonArray()) {
-                        List<String> versions = new ArrayList<>();
-                        for (JsonElement e : apiVersionElem.getAsJsonArray()) {
-                            versions.add(e.getAsString());
-                        }
-                        response.setApiVersion(String.join(",", versions));
-                    } else if (apiVersionElem.isJsonPrimitive()) {
-                        response.setApiVersion(apiVersionElem.getAsString());
-                    }
+                    response.setApiVersion(notes.get(CAPABILITIES_NOTES_API_VERSION).toString());
                 }
             }
-
             if (capabilities.has(CAPABILITIES_THEMING)) {
                 final var theming = capabilities.getAsJsonObject(CAPABILITIES_THEMING);
                 if (theming.has(CAPABILITIES_THEMING_COLOR)) {