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

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

Replace `instance_status` by `distance_from_current`, implements #606 (#607) 

This commit replaces the `instance_status` column with a more veratile `distance_from_current` which has additional semantics for upcoming instances.
parent d0ff43ee

opentasks-contract/src/main/java/org/dmfs/tasks/contract/TaskContract.java

+3 −19
Original line number Diff line number Diff line
@@ -1044,30 +1044,14 @@ public final class TaskContract 
        String INSTANCE_ORIGINAL_TIME = "instance_original_time";



        /**

         * A flag indicating the completion status of an instance. This is one of {@link #INSTANCE_STATUS_CLOSED}, {@link #INSTANCE_STATUS_NEXT} or {@link

         * #INSTANCE_STATUS_UPCOMING}.

         * The distance of the instance from the current one. For closed instances this is always {@code -1}, for the current instance this is {@code 0}. For

         * the instance after the current one this is {@code 1}, for the instance after that one it's {@code 2}, etc..

         * <p>

         * Value: Integer

         * <p>

         * read-only

         */

        String INSTANCE_STATUS = "instance_status";



        /**

         * Status of an instance which is completed or cancelled.

         */

        int INSTANCE_STATUS_CLOSED = -1;



        /**

         * Status of the next instance to complete.

         */

        int INSTANCE_STATUS_NEXT = 0;



        /**

         * Status of all instances after the next one.

         */

        int INSTANCE_STATUS_UPCOMING = 1;



        String DISTANCE_FROM_CURRENT = "distance_from_current";

    }

opentasks-provider/src/androidTest/java/org/dmfs/provider/tasks/TaskProviderTest.java

+12 −12
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class TaskProviderTest 
                        new IsNull(Instances.INSTANCE_DUE_SORTING),

                        new IsNull(Instances.INSTANCE_DURATION),

                        new IsNull(Tasks.TZ),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -193,7 +193,7 @@ public class TaskProviderTest 
                        new IsNull(Instances.INSTANCE_DUE_SORTING),

                        new IsNull(Instances.INSTANCE_DURATION),

                        new IsNull(Tasks.TZ),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                )),

                new AssertRelated<>(new InstanceTable(mAuthority), Instances.TASK_ID, task2, new AllOf(

                        new IsNull(Instances.INSTANCE_START),
@@ -203,7 +203,7 @@ public class TaskProviderTest 
                        new IsNull(Instances.INSTANCE_DUE_SORTING),

                        new IsNull(Instances.INSTANCE_DURATION),

                        new IsNull(Tasks.TZ),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                )),

                new AssertRelated<>(new InstanceTable(mAuthority), Instances.TASK_ID, task3, new AllOf(

                        new IsNull(Instances.INSTANCE_START),
@@ -213,7 +213,7 @@ public class TaskProviderTest 
                        new IsNull(Instances.INSTANCE_DUE_SORTING),

                        new IsNull(Instances.INSTANCE_DURATION),

                        new IsNull(Tasks.TZ),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -245,7 +245,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, due.shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_DURATION, due.getTimestamp() - start.getTimestamp()),

                        new EqArg(Tasks.TZ, start.isAllDay() ? "UTC" : start.getTimeZone().getID()),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -278,7 +278,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, due.shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_DURATION, due.getTimestamp() - start.getTimestamp()),

                        new EqArg(Tasks.TZ, start.isAllDay() ? "UTC" : start.getTimeZone().getID()),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_CLOSED)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, -1)

                ))

        ));

    }
@@ -314,7 +314,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, dueNew.shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_DURATION, dueNew.getTimestamp() - startNew.getTimestamp()),

                        new EqArg(Tasks.TZ, start.isAllDay() ? "UTC" : start.getTimeZone().getID()),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -350,7 +350,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, dueNew.shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_DURATION, dueNew.getTimestamp() - startNew.getTimestamp()),

                        new EqArg(Tasks.TZ, start.isAllDay() ? "UTC" : start.getTimeZone().getID()),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -382,7 +382,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, due.shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_DURATION, due.getTimestamp() - start.getTimestamp()),

                        new EqArg(Tasks.TZ, start.isAllDay() ? "UTC" : start.getTimeZone().getID()),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -415,7 +415,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, start.addDuration(duration).shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_ORIGINAL_TIME, 0),

                        new EqArg(Tasks.TZ, "UTC"),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -452,7 +452,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, start.addDuration(duration).shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_ORIGINAL_TIME, 0),

                        new EqArg(Tasks.TZ, "America/New_York"),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }
@@ -493,7 +493,7 @@ public class TaskProviderTest 
                        new EqArg(Instances.INSTANCE_DUE_SORTING, due2.shiftTimeZone(TimeZone.getDefault()).getInstance()),

                        new EqArg(Instances.INSTANCE_ORIGINAL_TIME, 0),

                        new EqArg(Tasks.TZ, "UTC"),

                        new EqArg(Instances.INSTANCE_STATUS, Instances.INSTANCE_STATUS_NEXT)

                        new EqArg(Instances.DISTANCE_FROM_CURRENT, 0)

                ))

        ));

    }

opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskDatabaseHelper.java

+2 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class TaskDatabaseHelper extends SQLiteOpenHelper 
                    + TaskContract.Instances.INSTANCE_DUE_SORTING + " INTEGER, "

                    + TaskContract.Instances.INSTANCE_DURATION + " INTEGER, "

                    + TaskContract.Instances.INSTANCE_ORIGINAL_TIME + " INTEGER DEFAULT 0, "

                    + TaskContract.Instances.INSTANCE_STATUS + " INTEGER DEFAULT " + TaskContract.Instances.INSTANCE_STATUS_NEXT + ");";

                    + TaskContract.Instances.DISTANCE_FROM_CURRENT + " INTEGER DEFAULT 0);";



    /**

     * SQL command to create a trigger to clean up data of removed tasks.
@@ -770,8 +770,7 @@ public class TaskDatabaseHelper extends SQLiteOpenHelper 


        if (oldVersion < 18)

        {

            db.execSQL(

                    "alter table " + Tables.INSTANCES + " add column " + TaskContract.Instances.INSTANCE_STATUS + " integer default " + TaskContract.Instances.INSTANCE_STATUS_NEXT + ";");

            db.execSQL("alter table " + Tables.INSTANCES + " add column " + TaskContract.Instances.DISTANCE_FROM_CURRENT + " integer default 0;");

        }



        // upgrade FTS

opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/instancedata/Stated.java→opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/instancedata/Distant.java

+4 −5
Original line number Diff line number Diff line
@@ -24,20 +24,19 @@ import org.dmfs.tasks.contract.TaskContract; 




/**

 * A {@link Single} of the instance status {@link ContentValues} of an instance.

 * A {@link Single} of the instance distance {@link ContentValues} of an instance.

 *

 * @author Marten Gajda

 */

public final class Stated extends DelegatingSingle<ContentValues>

public final class Distant extends DelegatingSingle<ContentValues>

{



    public Stated(boolean closed, Single<ContentValues> delegate)

    public Distant(int distance, Single<ContentValues> delegate)

    {

        super(() ->

        {

            ContentValues values = delegate.value();

            values.put(TaskContract.Instances.INSTANCE_STATUS,

                    closed ? TaskContract.Instances.INSTANCE_STATUS_CLOSED : TaskContract.Instances.INSTANCE_STATUS_NEXT);

            values.put(TaskContract.Instances.DISTANCE_FROM_CURRENT, distance);

            return values;

        });

    }

opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/instancedata/VanillaInstanceData.java

+3 −2
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ import org.dmfs.tasks.contract.TaskContract; 


/**

 * A {@link Single} of instance data {@link ContentValues}. It initializes most columns with {@code null} values, except for {@link

 * TaskContract.Instances#TASK_ID} which is left out and {@link TaskContract.Instances#INSTANCE_ORIGINAL_TIME} which is initialized with {@code 0}.

 * TaskContract.Instances#TASK_ID} which is left out, {@link TaskContract.Instances#INSTANCE_ORIGINAL_TIME} which is initialized with {@code 0} and {@link

 * TaskContract.Instances#DISTANCE_FROM_CURRENT} which is initialized with {@code 0} as well.

 *

 * @author Marten Gajda

 */
@@ -39,7 +40,7 @@ public final class VanillaInstanceData implements Single<ContentValues> 
        values.putNull(TaskContract.Instances.INSTANCE_DUE);

        values.putNull(TaskContract.Instances.INSTANCE_DUE_SORTING);

        values.putNull(TaskContract.Instances.INSTANCE_DURATION);

        values.put(TaskContract.Instances.INSTANCE_STATUS, TaskContract.Instances.INSTANCE_STATUS_NEXT);

        values.put(TaskContract.Instances.DISTANCE_FROM_CURRENT, 0);

        values.put(TaskContract.Instances.INSTANCE_ORIGINAL_TIME, 0);

        return values;

    }