#628 check for null in findDelta

1 files changed, 10 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AbstractSyncDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AbstractSyncDataProvider.java
index 166d6c519..d43550729 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AbstractSyncDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AbstractSyncDataProvider.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.model.interfaces.IRemoteEntity;
 import it.niedermann.nextcloud.deck.persistence.sync.adapters.ServerAdapter;
@@ -39,9 +40,17 @@ public abstract class AbstractSyncDataProvider<T extends IRemoteEntity> {
     public static <T extends IRemoteEntity> List<T> findDelta(List<T> listA, List<T> listB){
         List<T> delta = new ArrayList<>();
         for (T b : listB) {
+            if (b == null) {
+                DeckLog.error("Entry in listB is null! skipping...");
+                continue;
+            }
             boolean found = false;
             for (T a : listA) {
-                if ((a.getLocalId()!= null && b.getLocalId()!= null ? (a.getLocalId().equals(b.getLocalId()))
+                if (a == null) {
+                    DeckLog.error("Entry in listA is null! skipping...");
+                    continue;
+                }
+                if ((a.getLocalId() != null && b.getLocalId() != null ? (a.getLocalId().equals(b.getLocalId()))
                         : a.getId().equals(b.getId())) && b.getAccountId() == a.getAccountId()) {
                     found = true;
                     break;