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

Commit 824a510b authored by Gabor Keszthelyi's avatar Gabor Keszthelyi Committed by Marten Gajda
Browse files

Update RowData classes to use CharSequenceRowData.

parent 5594ed78

opentaskspal/src/main/java/org/dmfs/opentaskspal/tasklists/NameData.java

+5 −13
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package org.dmfs.opentaskspal.tasklists;



import android.content.ContentProviderOperation;

import android.support.annotation.NonNull;



import org.dmfs.android.contentpal.RowData;

import org.dmfs.android.contentpal.TransactionContext;

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

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

import org.dmfs.tasks.contract.TaskContract;
@@ -29,21 +29,13 @@ import org.dmfs.tasks.contract.TaskContract; 
 *

 * @author Gabor Keszthelyi

 */

public final class NameData implements RowData<TaskContract.TaskLists>

public final class NameData extends DelegatingRowData<TaskContract.TaskLists>

{

    private final CharSequence mName;





    public NameData(@NonNull CharSequence name)

    {

        mName = name;

        // TODO CharSequenceRowData allows null so this class wouldn't fail with that but erase the value

        super(new CharSequenceRowData<TaskContract.TaskLists>(TaskContract.TaskLists.LIST_NAME, name));

    }





    @NonNull

    @Override

    public ContentProviderOperation.Builder updatedBuilder(@NonNull TransactionContext transactionContext, @NonNull ContentProviderOperation.Builder builder)

    {

        return builder.withValue(TaskContract.TaskLists.LIST_NAME, mName.toString());

    }

}
 
 No newline at end of file

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

+4 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package org.dmfs.opentaskspal.tasks; 
import android.support.annotation.NonNull;



import org.dmfs.android.contentpal.RowData;

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

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

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

import org.dmfs.tasks.contract.TaskContract;
@@ -31,9 +31,10 @@ import org.dmfs.tasks.contract.TaskContract; 
 */

public final class OriginalInstanceSyncIdData extends DelegatingRowData<TaskContract.Tasks>

{

    public OriginalInstanceSyncIdData(@NonNull String originalInstanceSyncId)

    public OriginalInstanceSyncIdData(@NonNull CharSequence originalInstanceSyncId)

    {

        super(new RawRowData<TaskContract.Tasks>(TaskContract.Tasks.ORIGINAL_INSTANCE_SYNC_ID, originalInstanceSyncId));

        // TODO CharSequenceRowData allows null so this class wouldn't fail with that but erase the value

        super(new CharSequenceRowData<TaskContract.Tasks>(TaskContract.Tasks.ORIGINAL_INSTANCE_SYNC_ID, originalInstanceSyncId));

    }



}

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

+4 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package org.dmfs.opentaskspal.tasks; 
import android.support.annotation.NonNull;



import org.dmfs.android.contentpal.RowData;

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

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

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

import org.dmfs.tasks.contract.TaskContract;
@@ -31,8 +31,9 @@ import org.dmfs.tasks.contract.TaskContract; 
 */

public final class SyncIdData extends DelegatingRowData<TaskContract.Tasks>

{

    public SyncIdData(@NonNull String syncId)

    public SyncIdData(@NonNull CharSequence syncId)

    {

        super(new RawRowData<TaskContract.Tasks>(TaskContract.Tasks._SYNC_ID, syncId));

        // TODO CharSequenceRowData allows null so this class wouldn't fail with that but erase the value

        super(new CharSequenceRowData<TaskContract.Tasks>(TaskContract.Tasks._SYNC_ID, syncId));

    }

}