Add cancel logging

jberkel · jberkel · commit c3d736156de8 · 2017-10-29T20:01:45.000+01:00
diff --git a/app/src/main/java/com/zegoggles/smssync/activity/MainActivity.java b/app/src/main/java/com/zegoggles/smssync/activity/MainActivity.java
@@ -273,6 +273,24 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    @Subscribe public void autoBackupChanged(final AutoBackupChangedEvent event) {
+        if (LOCAL_LOGV) {
+            Log.v(TAG, "autoBackupChanged("+event+")");
+        }
+        final ComponentName componentName = new ComponentName(MainActivity.this, SmsBroadcastReceiver.class);
+
+        getPackageManager().setComponentEnabledSetting(
+                componentName,
+                event.autoBackupEnabled ? COMPONENT_ENABLED_STATE_ENABLED : COMPONENT_ENABLED_STATE_DISABLED,
+                DONT_KILL_APP);
+
+        if (event.autoBackupEnabled) {
+            getBackupJobs().scheduleFirstRegular();
+        } else {
+            getBackupJobs().cancel();
+        }
+    }
+
     @Subscribe public void onOAuth2Callback(OAuth2CallbackTask.OAuth2CallbackEvent event) {
         dismiss(Dialogs.ACCESS_TOKEN);
         if (event.valid()) {
@@ -376,15 +394,15 @@ public void run() {
                 WIFI_ONLY.key);
     }
 
-    private void addSummaryListener(final Runnable r, String... prefs) {
+    private void addSummaryListener(final Runnable runnable, String... prefs) {
         for (String p : prefs) {
             findPreference(p).setOnPreferenceChangeListener(
                     new OnPreferenceChangeListener() {
                         public boolean onPreferenceChange(Preference preference, final Object newValue) {
                             new Handler().post(new Runnable() {
                                 @Override
                                 public void run() {
-                                    r.run();
+                                    runnable.run();
                                     onContentChanged();
                                 }
                             });
@@ -793,7 +811,7 @@ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
         findPreference(ENABLE_AUTO_BACKUP.key)
                 .setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        autoBackupWillChange((Boolean) newValue);
+                        App.bus.post(new AutoBackupChangedEvent((Boolean) newValue));
                         return true;
                     }
                 });
@@ -884,22 +902,6 @@ public void run() {
         }
     }
 
-    private void autoBackupWillChange(boolean autoBackupEnabled) {
-        if (LOCAL_LOGV) {
-            Log.v(TAG, "autoBackupWillChange("+autoBackupEnabled+")");
-        }
-        final ComponentName componentName = new ComponentName(MainActivity.this, SmsBroadcastReceiver.class);
-
-        getPackageManager().setComponentEnabledSetting(
-                componentName,
-                autoBackupEnabled ? COMPONENT_ENABLED_STATE_ENABLED : COMPONENT_ENABLED_STATE_DISABLED,
-                DONT_KILL_APP);
-
-        if (!autoBackupEnabled) {
-            getBackupJobs().cancel();
-        }
-    }
-
     private BackupJobs getBackupJobs() {
         return new BackupJobs(this);
     }
@@ -988,4 +990,12 @@ private void checkDefaultSmsApp() {
             restoreDefaultSmsProvider(preferences.getSmsDefaultPackage());
         }
     }
+
+    public static class AutoBackupChangedEvent {
+        final boolean autoBackupEnabled;
+
+        AutoBackupChangedEvent(boolean autoBackupEnabled) {
+            this.autoBackupEnabled = autoBackupEnabled;
+        }
+    }
 }
diff --git a/app/src/main/java/com/zegoggles/smssync/service/BackupJobs.java b/app/src/main/java/com/zegoggles/smssync/service/BackupJobs.java
@@ -31,6 +31,7 @@
 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.zegoggles.smssync.App.LOCAL_LOGV;
 import static com.zegoggles.smssync.App.TAG;
@@ -61,6 +62,10 @@ public Job scheduleIncoming() {
         return schedule(mPreferences.getIncomingTimeoutSecs(), INCOMING, false);
     }
 
+    public Job scheduleFirstRegular() {
+        return schedule(mPreferences.getRegularTimeoutSecs(), REGULAR, true);
+    }
+
     public Job scheduleRegular() {
         return schedule(mPreferences.getRegularTimeoutSecs(), REGULAR, false);
     }
@@ -74,7 +79,14 @@ public Job scheduleImmediate() {
     }
 
     public void cancel() {
-        firebaseJobDispatcher.cancelAll();
+        final int result = firebaseJobDispatcher.cancelAll();
+        if (result == CANCEL_RESULT_SUCCESS) {
+            if (LOCAL_LOGV) {
+                Log.v(TAG, "cancel()");
+            }
+        } else {
+            Log.w(TAG, "unable to cancel jobs: "+result);
+        }
     }
 
     @Nullable private Job schedule(int inSeconds, BackupType backupType, boolean force) {
