#687 fixed another npe

1 files changed, 21 insertions, 16 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java
index feee8cfa6..782b6d951 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/DataPropagationHelper.java
@@ -106,23 +106,28 @@ public class DataPropagationHelper {
         provider.deleteInDB(dataBaseAdapter, accountId, entity);
         boolean connected = serverAdapter.hasInternetConnection();
         if (entity.getId() != null && connected) {
-            provider.deleteOnServer(serverAdapter, accountId, new IResponseCallback<Void>(new Account(accountId)) {
-                @Override
-                public void onResponse(Void response) {
-                    new Thread(() -> {
-                        provider.deletePhysicallyInDB(dataBaseAdapter, accountId, entity);
-                        callback.onResponse(null);
-                    }).start();
-                }
+            try {
+                provider.deleteOnServer(serverAdapter, accountId, new IResponseCallback<Void>(new Account(accountId)) {
+                    @Override
+                    public void onResponse(Void response) {
+                        new Thread(() -> {
+                            provider.deletePhysicallyInDB(dataBaseAdapter, accountId, entity);
+                            callback.onResponse(null);
+                        }).start();
+                    }
+
+                    @Override
+                    public void onError(Throwable throwable) {
+                        super.onError(throwable);
+                        new Thread(() -> {
+                            callback.onError(throwable);
+                        }).start();
+                    }
+                }, entity, dataBaseAdapter);
+            } catch (Throwable t) {
+                callback.onError(t);
+            }
 
-                @Override
-                public void onError(Throwable throwable) {
-                    super.onError(throwable);
-                    new Thread(() -> {
-                        callback.onError(throwable);
-                    }).start();
-                }
-            }, entity, dataBaseAdapter);
         } else {
             callback.onResponse(null);
         }