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

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

Revisit Relation contract. Implements #457 (#524) 

* remove all the `public static final` modifiers
* remove RELATED_URL
* remove some currently unsupported RelTypes
* convert RelTypes from enum to ints to allow unsupported reltypes.
parent 5801cccb

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

+169 −207

File changed.

Preview size limit exceeded, changes collapsed.

opentasks-provider/src/main/java/org/dmfs/provider/tasks/handler/RelationHandler.java

+10 −20
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.database.sqlite.SQLiteDatabase; 


import org.dmfs.provider.tasks.TaskDatabaseHelper;

import org.dmfs.tasks.contract.TaskContract.Property.Relation;

import org.dmfs.tasks.contract.TaskContract.Property.Relation.RelType;

import org.dmfs.tasks.contract.TaskContract.Tasks;
@@ -44,21 +43,13 @@ public class RelationHandler extends PropertyHandler 


        Long id = values.getAsLong(Relation.RELATED_ID);

        String uid = values.getAsString(Relation.RELATED_UID);

        String uri = values.getAsString(Relation.RELATED_URI);



        if (id == null && uri == null && uid != null)

        if (id == null && uid != null)

        {

            values.putNull(Relation.RELATED_ID);

            values.putNull(Relation.RELATED_URI);

        }

        else if (id == null && uid == null && uri != null)

        else if (id != null && uid == null)

        {

            values.putNull(Relation.RELATED_ID);

            values.putNull(Relation.RELATED_UID);

        }

        else if (id != null && uid == null && uri == null)

        {

            values.putNull(Relation.RELATED_URI);

            values.putNull(Relation.RELATED_UID);

        }

        else
@@ -99,8 +90,7 @@ public class RelationHandler extends PropertyHandler 




    /**

     * Resolve <code>_id</code> or <code>_uid</code>, depending of which value is given. We can't resolve anything if only {@link Relation#RELATED_URI} is

     * given. The given values are update in-place.

     * Resolve <code>_id</code> or <code>_uid</code>, depending of which value is given.

     * <p>

     * TODO: store links into the calendar provider if we find an event that matches the UID.

     * </p>
@@ -179,7 +169,7 @@ public class RelationHandler extends PropertyHandler 
            type = oldValues.getInt(oldValues.getColumnIndex(Relation.RELATED_TYPE));

        }



        if (type == RelType.PARENT.ordinal())

        if (type == Relation.RELTYPE_PARENT)

        {

            // this is a link to the parent, we need to update the PARENT_ID of this task, if we can
@@ -191,7 +181,7 @@ public class RelationHandler extends PropertyHandler 
            }

            // else: the parent task is probably not synced yet, we have to fix this in RelationUpdaterHook

        }

        else if (type == RelType.CHILD.ordinal())

        else if (type == Relation.RELTYPE_CHILD)

        {

            // this is a link to a child, we need to update the PARENT_ID of the linked task
@@ -203,7 +193,7 @@ public class RelationHandler extends PropertyHandler 
            }

            // else: the child task is probably not synced yet, we have to fix this in RelationUpdaterHook

        }

        else if (type == RelType.SIBLING.ordinal())

        else if (type == Relation.RELTYPE_SIBLING)

        {

            // this is a link to a sibling, we need to copy the PARENT_ID of the linked task to this task

            if (values.getAsLong(Relation.RELATED_ID) != null)
@@ -238,7 +228,7 @@ public class RelationHandler extends PropertyHandler 
		 * FIXME: For now we ignore that fact. But we should fix it.

		 */



        if (type == RelType.PARENT.ordinal())

        if (type == Relation.RELTYPE_PARENT)

        {

            // this was a link to the parent, we're orphaned now, so clear PARENT_ID of this task
@@ -246,7 +236,7 @@ public class RelationHandler extends PropertyHandler 
            taskValues.putNull(Tasks.PARENT_ID);

            db.update(TaskDatabaseHelper.Tables.TASKS, taskValues, Tasks._ID + "=" + taskId, null);

        }

        else if (type == RelType.CHILD.ordinal())

        else if (type == Relation.RELTYPE_CHILD)

        {

            // this was a link to a child, the child is orphaned now, clear its PARENT_ID
@@ -258,7 +248,7 @@ public class RelationHandler extends PropertyHandler 
                db.update(TaskDatabaseHelper.Tables.TASKS, taskValues, Tasks._ID + "=" + oldValues.getLong(relIdCol), null);

            }

        }

        else if (type == RelType.SIBLING.ordinal())

        else if (type == Relation.RELTYPE_SIBLING)

        {

            /*

             * This was a link to a sibling, since it's no longer our sibling either it or we're orphaned now We won't know unless we check all relations.

opentaskspal/src/main/java/org/dmfs/opentaskspal/tasks/ChildTaskRelationData.java

+4 −4
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import org.dmfs.android.contentpal.RowData; 
import org.dmfs.android.contentpal.RowSnapshot;

import org.dmfs.android.contentpal.rowdata.DelegatingRowData;

import org.dmfs.tasks.contract.TaskContract;

import org.dmfs.tasks.contract.TaskContract.Property.Relation.RelType;





/**

 * {@link RowData} to add the {@link RelType#CHILD} relation between the 2 given tasks, to the {@link TaskContract.Properties} table.

 * {@link RowData} to add the {@link TaskContract.Property.Relation#RELTYPE_CHILD} relation between the 2 given tasks, to the {@link TaskContract.Properties}

 * table.

 *

 * @author Gabor Keszthelyi

 */
@@ -32,13 +32,13 @@ public final class ChildTaskRelationData extends DelegatingRowData<TaskContract. 
{

    public ChildTaskRelationData(RowSnapshot<TaskContract.Tasks> childTask, RowSnapshot<TaskContract.Tasks> parentTask)

    {

        super(new RelationData(parentTask, RelType.CHILD, childTask));

        super(new RelationData(parentTask, TaskContract.Property.Relation.RELTYPE_CHILD, childTask));

    }





    public ChildTaskRelationData(CharSequence childTaskUid, RowSnapshot<TaskContract.Tasks> parentTask)

    {

        super(new RelationData(parentTask, RelType.CHILD, childTaskUid));

        super(new RelationData(parentTask, TaskContract.Property.Relation.RELTYPE_CHILD, childTaskUid));

    }



}

opentaskspal/src/main/java/org/dmfs/opentaskspal/tasks/ParentTaskRelationData.java

+5 −4
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import org.dmfs.android.contentpal.RowData; 
import org.dmfs.android.contentpal.RowSnapshot;

import org.dmfs.android.contentpal.rowdata.DelegatingRowData;

import org.dmfs.tasks.contract.TaskContract;

import org.dmfs.tasks.contract.TaskContract.Property.Relation.RelType;





/**

 * {@link RowData} to add the {@link RelType#PARENT} relation between the 2 given tasks, to the {@link TaskContract.Properties} table.

 * {@link RowData} to add the {@link TaskContract.Property.Relation#RELTYPE_PARENT} relation between the 2 given tasks, to the {@link TaskContract.Properties}

 * table.

 *

 * @author Gabor Keszthelyi

 */
@@ -32,12 +32,13 @@ public final class ParentTaskRelationData extends DelegatingRowData<TaskContract 
{

    public ParentTaskRelationData(RowSnapshot<TaskContract.Tasks> parentTask, RowSnapshot<TaskContract.Tasks> childTask)

    {

        super(new RelationData(childTask, RelType.PARENT, parentTask));

        super(new RelationData(childTask, TaskContract.Property.Relation.RELTYPE_PARENT, parentTask));

    }





    public ParentTaskRelationData(CharSequence parentTaskUid, RowSnapshot<TaskContract.Tasks> childTask)

    {

        super(new RelationData(childTask, RelType.PARENT, parentTaskUid));

        super(new RelationData(childTask, TaskContract.Property.Relation.RELTYPE_PARENT, parentTaskUid));

    }



}

opentaskspal/src/main/java/org/dmfs/opentaskspal/tasks/RelationData.java

+4 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import org.dmfs.android.contentpal.rowdata.DelegatingRowData; 
import org.dmfs.android.contentpal.rowdata.RawRowData;

import org.dmfs.android.contentpal.rowdata.Referring;

import org.dmfs.tasks.contract.TaskContract;

import org.dmfs.tasks.contract.TaskContract.Property.Relation.RelType;





/**
@@ -37,23 +36,23 @@ import org.dmfs.tasks.contract.TaskContract.Property.Relation.RelType; 
public final class RelationData extends DelegatingRowData<TaskContract.Properties>

{

    public RelationData(@NonNull RowSnapshot<TaskContract.Tasks> relatingTask,

                        @NonNull RelType relType,

                        int relType,

                        @NonNull RowSnapshot<TaskContract.Tasks> relatedTask)

    {

        super(new Composite<>(

                new Referring<TaskContract.Properties>(TaskContract.Property.Relation.TASK_ID, relatingTask),

                new RawRowData<TaskContract.Properties>(TaskContract.Property.Relation.RELATED_TYPE, relType.ordinal()),

                new RawRowData<TaskContract.Properties>(TaskContract.Property.Relation.RELATED_TYPE, relType),

                new Referring<TaskContract.Properties>(TaskContract.Property.Relation.RELATED_ID, relatedTask)));

    }





    public RelationData(@NonNull RowSnapshot<TaskContract.Tasks> relatingTask,

                        @NonNull RelType relType,

                        int relType,

                        @NonNull CharSequence relatedTaskUid)

    {

        super(new Composite<>(

                new Referring<TaskContract.Properties>(TaskContract.Property.Relation.TASK_ID, relatingTask),

                new RawRowData<TaskContract.Properties>(TaskContract.Property.Relation.RELATED_TYPE, relType.ordinal()),

                new RawRowData<TaskContract.Properties>(TaskContract.Property.Relation.RELATED_TYPE, relType),

                new CharSequenceRowData<TaskContract.Properties>(TaskContract.Property.Relation.RELATED_UID, relatedTaskUid)));

    }

}