check empty response

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

Author: alperozturk96

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

@@ -13,10 +13,11 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.google.gson.JsonSyntaxException;
+import com.nextcloud.android.sso.api.EmptyResponse;
 import com.nextcloud.android.sso.model.SingleSignOnAccount;
 
-import io.reactivex.Observable;
+import java.util.Objects;
+
 import it.niedermann.owncloud.notes.shared.model.Capabilities;
 
 @WorkerThread
@@ -42,19 +43,19 @@ public static Capabilities getCapabilities(@NonNull Context context, @NonNull Si
             }
 
             repository.insertCapabilities(capabilities);
-            return capabilities;
-        } catch (RuntimeException e) {
-            final var cause = e.getCause();
 
-            if (e instanceof JsonSyntaxException || (cause instanceof JsonSyntaxException)) {
-                Log.w(TAG, "JSON parse error, likely 304 Not Modified");
+            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();
             if (cause != null) {
                 throw cause;
             } else {
-                throw e;
+                throw t;
             }
         }
     }

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

@@ -17,8 +17,8 @@
 
 import androidx.annotation.NonNull;
 
-import com.google.gson.JsonSyntaxException;
 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,8 +34,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
-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;
@@ -228,21 +228,7 @@ private boolean pullRemoteChanges() {
                 return false;
             }
 
-            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 fetchResponse = notesAPI.getNotes(modified, localAccount.getETag()).blockingSingle();
             final var remoteNotes = fetchResponse.getResponse();
             final var remoteIDs = new HashSet<Long>();
             // pull remote changes: update or create each remote note
@@ -296,6 +282,11 @@ 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;