Persistent jobs, retry failed, skip connectivity check

tRuNKator · Nov 12, 2017 · b07a6d9 · b07a6d9
1 parent 50e4697
commit b07a6d9
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 10 deletions.
diff --git a/app/src/main/java/com/zegoggles/smssync/service/BackupJobs.java b/app/src/main/java/com/zegoggles/smssync/service/BackupJobs.java
@@ -26,13 +26,15 @@
 import com.firebase.jobdispatcher.GooglePlayDriver;
 import com.firebase.jobdispatcher.Job;
 import com.firebase.jobdispatcher.JobTrigger;
-import com.firebase.jobdispatcher.Lifetime;
+import com.firebase.jobdispatcher.RetryStrategy;
 import com.firebase.jobdispatcher.Trigger;
 import com.zegoggles.smssync.compat.GooglePlayServices;
 import com.zegoggles.smssync.preferences.Preferences;
 
 import static com.firebase.jobdispatcher.FirebaseJobDispatcher.CANCEL_RESULT_SUCCESS;
 import static com.firebase.jobdispatcher.FirebaseJobDispatcher.SCHEDULE_RESULT_SUCCESS;
+import static com.firebase.jobdispatcher.Lifetime.FOREVER;
+import static com.firebase.jobdispatcher.Lifetime.UNTIL_NEXT_BOOT;
 import static com.zegoggles.smssync.App.LOCAL_LOGV;
 import static com.zegoggles.smssync.App.TAG;
 import static com.zegoggles.smssync.service.BackupType.BROADCAST_INTENT;
@@ -71,7 +73,12 @@ public Job scheduleRegular() {
     }
 
     public Job scheduleBootup() {
-        return schedule(BOOT_BACKUP_DELAY, REGULAR, false);
+        if (mPreferences.isUseOldScheduler()) {
+            return schedule(BOOT_BACKUP_DELAY, REGULAR, false);
+        } else {
+            // assume jobs are persistent
+            return null;
+        }
     }
 
     public Job scheduleImmediate() {
@@ -119,10 +126,12 @@ public void cancel() {
         final Bundle extras = new Bundle();
         extras.putString(BackupType.EXTRA, backupType.name());
         return builder
-            .setReplaceCurrent(false)
+            .setReplaceCurrent(true)
             .setTrigger(trigger)
+            .setRecurring(backupType == REGULAR)
             .setConstraints(constraint)
-            .setLifetime(Lifetime.UNTIL_NEXT_BOOT)
+            .setRetryStrategy(RetryStrategy.DEFAULT_EXPONENTIAL)
+            .setLifetime(backupType == REGULAR ? FOREVER : UNTIL_NEXT_BOOT)
             .setTag(backupType.name())
             .setExtras(extras)
             .setService(SmsJobService.class)

diff --git a/app/src/main/java/com/zegoggles/smssync/service/SmsBackupService.java b/app/src/main/java/com/zegoggles/smssync/service/SmsBackupService.java
@@ -115,7 +115,7 @@ private void backup(BackupType backupType, boolean skip) {
             if (!skip) {
                 checkCredentials();
                 checkBackgroundDataSettings(backupType);
-                checkConnectivity();
+                checkConnectivity(backupType);
             }
 
             appLog(R.string.app_log_start_backup, backupType);
@@ -172,7 +172,12 @@ private void checkBackgroundDataSettings(BackupType backupType) throws RequiresB
         }
     }
 
-    private void checkConnectivity() throws ConnectivityException {
+    private void checkConnectivity(BackupType backupType) throws ConnectivityException {
+        if (backupType != MANUAL && !getPreferences().isUseOldScheduler()) {
+            Log.d(TAG, "skipping connectivity check, running with new scheduler");
+            return;
+        }
+
         NetworkInfo active = getConnectivityManager().getActiveNetworkInfo();
         if (active == null || !active.isConnectedOrConnecting()) {
             throw new NoConnectionException();

diff --git a/app/src/main/java/com/zegoggles/smssync/service/SmsJobService.java b/app/src/main/java/com/zegoggles/smssync/service/SmsJobService.java
@@ -87,7 +87,7 @@ public void backupStateChanged(BackupState state) {
         final JobParameters jobParameters = jobs.remove(state.backupType.name());
         if (jobParameters != null) {
             Log.v(TAG, "jobFinished("+jobParameters+")");
-            jobFinished(jobParameters, false);
+            jobFinished(jobParameters, state.isError());
         } else {
             Log.w(TAG, "unknown job for state "+state);
         }

diff --git a/app/src/test/java/com/zegoggles/smssync/service/BackupJobsTest.java b/app/src/test/java/com/zegoggles/smssync/service/BackupJobsTest.java
@@ -55,12 +55,20 @@ public class BackupJobsTest {
         verifyJobScheduled(job, 2000, "REGULAR");
     }
 
-    @Test public void shouldScheduleBoot() throws Exception {
+    @Test public void shouldScheduleBootForOldScheduler() throws Exception {
         when(preferences.isEnableAutoSync()).thenReturn(true);
+        when(preferences.isUseOldScheduler()).thenReturn(true);
         Job job = subject.scheduleBootup();
         verifyJobScheduled(job, 60, "REGULAR");
     }
 
+    @Test public void shouldNotScheduleBootForNewScheduler() throws Exception {
+        when(preferences.isEnableAutoSync()).thenReturn(true);
+        when(preferences.isUseOldScheduler()).thenReturn(false);
+        Job job = subject.scheduleBootup();
+        assertThat(job).isNull();
+    }
+
     @Test public void shouldScheduleIncoming() throws Exception {
         when(preferences.isEnableAutoSync()).thenReturn(true);
         when(preferences.getIncomingTimeoutSecs()).thenReturn(2000);
@@ -78,8 +86,8 @@ public class BackupJobsTest {
         assertThat(subject.scheduleIncoming()).isEqualTo(null);
     }
 
-    private void verifyJobScheduled(Job job, int scheduled, String expectedType)
-    {
+    private void verifyJobScheduled(Job job, int scheduled, String expectedType) {
+        assertThat(job).isNotNull();
         if (scheduled <= 0) {
             assertThat(job.getTrigger() instanceof JobTrigger.ImmediateTrigger);
         } else {

diff --git a/app/src/test/java/com/zegoggles/smssync/service/SmsBackupServiceTest.java b/app/src/test/java/com/zegoggles/smssync/service/SmsBackupServiceTest.java
@@ -83,6 +83,7 @@ private UserNotification(String title, String text) {
         when(authPreferences.getStoreUri()).thenReturn("imap+ssl+://xoauth:[email protected]:993");
         when(authPreferences.isLoginInformationSet()).thenReturn(true);
         when(preferences.getBackupContactGroup()).thenReturn(ContactGroup.EVERYBODY);
+        when(preferences.isUseOldScheduler()).thenReturn(true);
     }
 
     @After public void after() {
@@ -120,6 +121,17 @@ private UserNotification(String title, String text) {
         assertThat(service.getState().exception).isExactlyInstanceOf(NoConnectionException.class);
     }
 
+    @Test public void shouldNotCheckForConnectivityBeforeBackingUpWithNewScheduler() throws Exception {
+        when(preferences.isUseOldScheduler()).thenReturn(false);
+
+        Intent intent = new Intent();
+        intent.putExtra(BackupType.EXTRA, BackupType.REGULAR.name());
+        shadowConnectivityManager.setActiveNetworkInfo(null);
+        shadowConnectivityManager.setBackgroundDataSetting(true);
+        service.handleIntent(intent);
+        verify(backupTask).execute(any(BackupConfig.class));
+    }
+
     @Test public void shouldCheckForWifiConnectivity() throws Exception {
         Intent intent = new Intent();
         when(preferences.isWifiOnly()).thenReturn(true);