fix: json syntax exceptions

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

@@ -13,16 +13,9 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.nextcloud.android.sso.api.ParsedResponse;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
 
-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 {

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

@@ -17,6 +17,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.google.gson.JsonSyntaxException;
 import com.nextcloud.android.sso.AccountImporter;
 import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
@@ -34,6 +35,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.reactivex.Observable;
 import it.niedermann.owncloud.notes.BuildConfig;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
@@ -226,7 +228,21 @@ private boolean pullRemoteChanges() {
                 return false;
             }
 
-            final var fetchResponse = notesAPI.getNotes(modified, localAccount.getETag()).blockingSingle();
+            final var fetchResponse = notesAPI.getNotes(modified, localAccount.getETag())
+                    .onErrorResumeNext(error -> {
+                        if (error instanceof JsonSyntaxException ||
+                                (error.getCause() != null && error.getCause() instanceof JsonSyntaxException)) {
+                            Log.w(TAG, "JSON parse error, likely 304 Not Modified");
+                            return Observable.empty();
+                        }
+                        return Observable.error(error);
+                    })
+                    .blockingFirst(null);
+
+            if (fetchResponse == null) {
+                Log.d(TAG, "No changes from server");
+                return true;
+            }
             final var remoteNotes = fetchResponse.getResponse();
             final var remoteIDs = new HashSet<Long>();
             // pull remote changes: update or create each remote note

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

@@ -17,6 +17,8 @@
 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;
@@ -89,9 +91,19 @@ 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)) {
-                    response.setApiVersion(notes.get(CAPABILITIES_NOTES_API_VERSION).toString());
+                    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());
+                    }
                 }
             }
+
             if (capabilities.has(CAPABILITIES_THEMING)) {
                 final var theming = capabilities.getAsJsonObject(CAPABILITIES_THEMING);
                 if (theming.has(CAPABILITIES_THEMING_COLOR)) {