isUpdated tolerates missing columns fixes #1017 (#1022)

dmfs · Mar 21, 2021 · f5ad4ae · f5ad4ae
1 parent a053c78
commit f5ad4ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/...-provider/src/main/java/org/dmfs/provider/tasks/model/CursorContentValuesTaskAdapter.java b/...-provider/src/main/java/org/dmfs/provider/tasks/model/CursorContentValuesTaskAdapter.java
@@ -94,7 +94,7 @@ public boolean isUpdated(FieldAdapter<?, TaskAdapter> fieldAdapter)
         {
             return false;
         }
-        Object oldValue = fieldAdapter.getFrom(mCursor);
+        Object oldValue = fieldAdapter.existsIn(mCursor) ? fieldAdapter.getFrom(mCursor) : null;
         Object newValue = fieldAdapter.getFrom(mValues);
         // we need to special case RRULE, because RecurrenceRule doesn't support `equals`
         if (fieldAdapter != TaskAdapter.RRULE)

diff --git a/...sks-provider/src/main/java/org/dmfs/provider/tasks/model/adapters/SimpleFieldAdapter.java b/...sks-provider/src/main/java/org/dmfs/provider/tasks/model/adapters/SimpleFieldAdapter.java
@@ -59,12 +59,7 @@ public boolean isSetIn(ContentValues values)
     public boolean existsIn(Cursor cursor)
     {
         int columnIdx = cursor.getColumnIndex(fieldName());
-        if (columnIdx < 0)
-        {
-            throw new IllegalArgumentException("The column '" + fieldName() + "' is missing in cursor.");
-        }
-
-        return !cursor.isNull(columnIdx);
+        return columnIdx >= 0 && !cursor.isNull(columnIdx);
     }