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

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

Update ContentPal to latest GitHub version, implements #763 (#764) 

In addition to just updating the ContentPal version this also replaces usages of deprecated jems classes.
parent 3a906fc2

dependencies.gradle

+1 −1
Original line number Diff line number Diff line 
def support_lib_version = '26.1.0'

def jems_version = '1.18'

def contentpal_version = '9b087b2' // 9b087b2 -> 2017-12-12

def contentpal_version = 'a7fbc62eef' //  a7fbc62eef -> 2018-08-19

def support_test_runner_version = '0.5'



ext.deps = [

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

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import android.database.sqlite.SQLiteOpenHelper; 
import android.net.Uri;



import org.dmfs.iterables.SingletonIterable;

import org.dmfs.iterables.decorators.Flattened;

import org.dmfs.jems.fragile.Fragile;

import org.dmfs.jems.iterable.composite.Joined;

import org.dmfs.jems.single.Single;

import org.dmfs.provider.tasks.utils.Profiled;
@@ -79,7 +79,7 @@ abstract class SQLiteContentProvider extends ContentProvider 
    protected SQLiteContentProvider(Iterable<TransactionEndTask> transactionEndTasks)

    {

        // append a task to set the transaction to successful

        mTransactionEndTasks = new Flattened<>(transactionEndTasks, new SingletonIterable<TransactionEndTask>(new SuccessfulTransactionEndTask()));

        mTransactionEndTasks = new Joined<>(transactionEndTasks, new SingletonIterable<>(new SuccessfulTransactionEndTask()));

    }

opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/instances/TaskValueDelegate.java

+5 −4
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ import org.dmfs.iterables.decorators.Filtered; 
import org.dmfs.iterables.elementary.Seq;

import org.dmfs.iterators.filters.NoneOf;

import org.dmfs.jems.iterable.composite.Joined;

import org.dmfs.optional.NullSafe;

import org.dmfs.optional.adapters.FirstPresent;

import org.dmfs.jems.optional.adapters.FirstPresent;

import org.dmfs.jems.optional.elementary.NullSafe;

import org.dmfs.jems.single.combined.Backed;

import org.dmfs.provider.tasks.TaskDatabaseHelper;

import org.dmfs.provider.tasks.model.ContentValuesInstanceAdapter;

import org.dmfs.provider.tasks.model.CursorContentValuesTaskAdapter;
@@ -106,9 +107,9 @@ public final class TaskValueDelegate implements EntityProcessor<InstanceAdapter> 
                    {

                        throw new IllegalArgumentException("Can't add an instance to an override instance");

                    }

                    DateTime masterDate = new FirstPresent<>(new Seq<>(

                    DateTime masterDate = new Backed<DateTime>(new FirstPresent<>(new Seq<>(

                            new NullSafe<>(masterTaskAdapter.valueOf(TaskAdapter.DTSTART)),

                            new NullSafe<>(masterTaskAdapter.valueOf(TaskAdapter.DUE)))).value(null);

                            new NullSafe<>(masterTaskAdapter.valueOf(TaskAdapter.DUE)))), () -> null).value();

                    if (!masterTaskAdapter.isRecurring() && masterDate != null)

                    {

                        // master is not recurring yet, also add its start as an RDATE

opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/instances/Validating.java

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import android.database.sqlite.SQLiteDatabase; 


import org.dmfs.iterables.decorators.Sieved;

import org.dmfs.iterables.elementary.Seq;

import org.dmfs.optional.First;

import org.dmfs.optional.NullSafe;

import org.dmfs.optional.Optional;

import org.dmfs.jems.optional.Optional;

import org.dmfs.jems.optional.adapters.First;

import org.dmfs.jems.optional.elementary.NullSafe;

import org.dmfs.provider.tasks.TaskDatabaseHelper;

import org.dmfs.provider.tasks.model.InstanceAdapter;

import org.dmfs.provider.tasks.model.TaskAdapter;

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

+5 −2
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ import android.database.sqlite.SQLiteDatabase; 


import org.dmfs.jems.iterable.composite.Diff;

import org.dmfs.jems.iterable.decorators.Mapped;

import org.dmfs.jems.optional.elementary.NullSafe;

import org.dmfs.jems.pair.Pair;

import org.dmfs.jems.single.Single;

import org.dmfs.optional.NullSafe;

import org.dmfs.jems.single.combined.Backed;

import org.dmfs.optional.Optional;

import org.dmfs.provider.tasks.TaskDatabaseHelper;

import org.dmfs.provider.tasks.model.TaskAdapter;
@@ -187,7 +188,9 @@ public final class Instantiating implements EntityProcessor<TaskAdapter> 
                    {

                        existingInstances.moveToPosition(cursorRow);

                        return (int) (existingInstances.getLong(startIdx) -

                                new NullSafe<>(newInstanceValues.getAsLong(TaskContract.Instances.INSTANCE_ORIGINAL_TIME)).value(0L));

                                new Backed<>(

                                        new NullSafe<>(newInstanceValues.getAsLong(TaskContract.Instances.INSTANCE_ORIGINAL_TIME)),

                                        0L).value());

                    });



            // sync the instances table with the new instances