Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f5ad4ae7 authored by Marten Gajda's avatar Marten Gajda Committed by GitHub
Browse files

isUpdated tolerates missing columns fixes #1017 (#1022)

parent a053c782

opentasks-provider/src/main/java/org/dmfs/provider/tasks/model/CursorContentValuesTaskAdapter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ public class CursorContentValuesTaskAdapter extends AbstractTaskAdapter 
        {

        {

            return false;

            return false;

        }

        }

        Object oldValue = fieldAdapter.getFrom(mCursor);

        Object oldValue = fieldAdapter.existsIn(mCursor) ? fieldAdapter.getFrom(mCursor) : null;

        Object newValue = fieldAdapter.getFrom(mValues);

        Object newValue = fieldAdapter.getFrom(mValues);

        // we need to special case RRULE, because RecurrenceRule doesn't support `equals`

        // we need to special case RRULE, because RecurrenceRule doesn't support `equals`

        if (fieldAdapter != TaskAdapter.RRULE)

        if (fieldAdapter != TaskAdapter.RRULE)

opentasks-provider/src/main/java/org/dmfs/provider/tasks/model/adapters/SimpleFieldAdapter.java

+1 −6
Original line number Original line Diff line number Diff line
@@ -59,12 +59,7 @@ public abstract class SimpleFieldAdapter<FieldType, EntityType> implements Field 
    public boolean existsIn(Cursor cursor)

    public boolean existsIn(Cursor cursor)

    {

    {

        int columnIdx = cursor.getColumnIndex(fieldName());

        int columnIdx = cursor.getColumnIndex(fieldName());

        if (columnIdx < 0)

        return columnIdx >= 0 && !cursor.isNull(columnIdx);

        {

            throw new IllegalArgumentException("The column '" + fieldName() + "' is missing in cursor.");

        }



        return !cursor.isNull(columnIdx);

    }

    }