solve git conflict

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

Author: alperozturk96

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

@@ -13,16 +13,10 @@
 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;
+import it.niedermann.owncloud.notes.util.ThrowableExtensionsKt;
 
 @WorkerThread
 public class CapabilitiesClient {
@@ -34,6 +28,8 @@ 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;
@@ -44,16 +40,20 @@ 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 (RuntimeException e) {
-            final var cause = e.getCause();
+        } catch (Throwable t) {
+            if (ThrowableExtensionsKt.isEmptyResponseCast(t)) {
+                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

@@ -42,6 +42,7 @@
 import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
 import it.niedermann.owncloud.notes.shared.model.SyncResultStatus;
 import it.niedermann.owncloud.notes.shared.util.ApiVersionUtil;
+import it.niedermann.owncloud.notes.util.ThrowableExtensionsKt;
 
 
 /**
@@ -280,6 +281,11 @@ private boolean pullRemoteChanges() {
             return true;
         } catch (Throwable t) {
             final Throwable cause = t.getCause();
+            if (ThrowableExtensionsKt.isEmptyResponseCast(t)) {
+                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;