diff --git a/app/build.gradle b/app/build.gradle index 2d537b7e0..d6c88a74e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ configurations { final DAGGER_VERSION = '2.16' final BUTTERKNIFE_VERSION = '9.0.0-rc2' final STETHO_VERSION = '1.5.0' -final WORK_VERSION = '1.0.0-alpha10' +final WORK_VERSION = '1.0.0-beta04' final LEAKCANARY_VERSION = '1.6.2' final ROOM_VERSION = '2.1.0-alpha03' @@ -172,10 +172,6 @@ dependencies { exclude group: 'com.google.guava', module: 'listenablefuture' } - googleplayImplementation("android.arch.work:work-firebase:${WORK_VERSION}") { - // https://groups.google.com/forum/#!topic/guava-announce/Km82fZG68Sw - exclude group: 'com.google.guava', module: 'listenablefuture' - } googleplayImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.8' googleplayImplementation "com.google.firebase:firebase-core:16.0.6" googleplayImplementation "com.google.android.gms:play-services-location:16.0.0" diff --git a/app/src/main/java/org/tasks/injection/InjectingWorker.java b/app/src/main/java/org/tasks/injection/InjectingWorker.java index dbd2acc5c..547487803 100644 --- a/app/src/main/java/org/tasks/injection/InjectingWorker.java +++ b/app/src/main/java/org/tasks/injection/InjectingWorker.java @@ -27,7 +27,7 @@ public abstract class InjectingWorker extends Worker { return run(); } catch (Exception e) { tracker.reportException(e); - return Result.FAILURE; + return Result.failure(); } } diff --git a/app/src/main/java/org/tasks/jobs/AfterSaveWork.java b/app/src/main/java/org/tasks/jobs/AfterSaveWork.java index ef584fa09..ecda05bf0 100644 --- a/app/src/main/java/org/tasks/jobs/AfterSaveWork.java +++ b/app/src/main/java/org/tasks/jobs/AfterSaveWork.java @@ -79,7 +79,7 @@ public class AfterSaveWork extends InjectingWorker { Task task = taskDao.fetch(taskId); if (task == null) { Timber.e("Missing saved task"); - return Result.FAILURE; + return Result.failure(); } reminderService.scheduleAlarm(task); @@ -117,7 +117,7 @@ public class AfterSaveWork extends InjectingWorker { localBroadcastManager.broadcastRefresh(); } - return Result.SUCCESS; + return Result.success(); } private void updateCalendarTitle(Task task) { diff --git a/app/src/main/java/org/tasks/jobs/BackupWork.java b/app/src/main/java/org/tasks/jobs/BackupWork.java index a484ace2e..a13c9ac67 100644 --- a/app/src/main/java/org/tasks/jobs/BackupWork.java +++ b/app/src/main/java/org/tasks/jobs/BackupWork.java @@ -73,7 +73,7 @@ public class BackupWork extends RepeatingWorker { protected Result run() { startBackup(context); preferences.setLong(R.string.p_last_backup, now()); - return Result.SUCCESS; + return Result.success(); } @Override diff --git a/app/src/main/java/org/tasks/jobs/CleanupWork.java b/app/src/main/java/org/tasks/jobs/CleanupWork.java index c4ec8bdab..1242d36f1 100644 --- a/app/src/main/java/org/tasks/jobs/CleanupWork.java +++ b/app/src/main/java/org/tasks/jobs/CleanupWork.java @@ -41,7 +41,7 @@ public class CleanupWork extends InjectingWorker { long[] tasks = getInputData().getLongArray(EXTRA_TASK_IDS); if (tasks == null) { Timber.e("No task ids provided"); - return Result.FAILURE; + return Result.failure(); } for (long task : tasks) { alarmService.cancelAlarms(task); @@ -58,7 +58,7 @@ public class CleanupWork extends InjectingWorker { } } timerPlugin.updateNotifications(); - return Result.SUCCESS; + return Result.success(); } @Override diff --git a/app/src/main/java/org/tasks/jobs/DriveUploader.java b/app/src/main/java/org/tasks/jobs/DriveUploader.java index e1ba3d441..fc8e6de2f 100644 --- a/app/src/main/java/org/tasks/jobs/DriveUploader.java +++ b/app/src/main/java/org/tasks/jobs/DriveUploader.java @@ -68,10 +68,10 @@ public class DriveUploader extends InjectingWorker { } } - return Result.SUCCESS; + return Result.success(); } catch (IOException e) { tracker.reportException(e); - return Result.FAILURE; + return Result.failure(); } } diff --git a/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.java b/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.java index da5fe38c4..0a82fd4bb 100644 --- a/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.java +++ b/app/src/main/java/org/tasks/jobs/MidnightRefreshWork.java @@ -19,7 +19,7 @@ public class MidnightRefreshWork extends RepeatingWorker { @Override protected Result run() { localBroadcastManager.broadcastRefresh(); - return Result.SUCCESS; + return Result.success(); } @Override diff --git a/app/src/main/java/org/tasks/jobs/RefreshWork.java b/app/src/main/java/org/tasks/jobs/RefreshWork.java index 55f09da1d..331f3d429 100644 --- a/app/src/main/java/org/tasks/jobs/RefreshWork.java +++ b/app/src/main/java/org/tasks/jobs/RefreshWork.java @@ -21,7 +21,7 @@ public class RefreshWork extends RepeatingWorker { @Override public Result run() { localBroadcastManager.broadcastRefresh(); - return Result.SUCCESS; + return Result.success(); } @Override diff --git a/app/src/main/java/org/tasks/jobs/SyncWork.java b/app/src/main/java/org/tasks/jobs/SyncWork.java index d85d754ed..b63409fbd 100644 --- a/app/src/main/java/org/tasks/jobs/SyncWork.java +++ b/app/src/main/java/org/tasks/jobs/SyncWork.java @@ -30,7 +30,7 @@ public class SyncWork extends InjectingWorker { public Result run() { synchronized (LOCK) { if (preferences.isSyncOngoing()) { - return Result.RETRY; + return Result.retry(); } } @@ -45,7 +45,7 @@ public class SyncWork extends InjectingWorker { preferences.setSyncOngoing(false); localBroadcastManager.broadcastRefresh(); } - return Result.SUCCESS; + return Result.success(); } @Override