Fixes (#59)

Author: smashedr

app/src/main/java/com/djangofiles/djangofiles/api/FeedbackApi.kt

@@ -17,7 +17,7 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-const val HOOK_ID = "1376004891192856586"  // 1376046470926438440
+const val HOOK_ID = "1376004891192856586"
 const val RELAY_URL = "https://relay.cssnr.com/"
 
 class FeedbackApi(val context: Context) {

app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt

@@ -78,7 +78,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         workInterval?.summaryProvider = ListPreference.SimpleSummaryProvider.getInstance()
         workInterval?.setOnPreferenceChangeListener { _, newValue ->
             Log.d("work_interval", "newValue: $newValue")
-            ctx.toggleWorkManager(workInterval, newValue)
+            ctx.updateWorkManager(workInterval, newValue)
         }
 
         // Background Restriction
@@ -216,20 +216,28 @@ class SettingsFragment : PreferenceFragmentCompat() {
         buildServerList()
     }
 
-    fun Context.toggleWorkManager(pref: ListPreference, newValue: Any): Boolean {
-        Log.d("toggleWorkManager", "newValue: $newValue")
+    fun Context.updateWorkManager(listPref: ListPreference, newValue: Any): Boolean {
+        Log.d("updateWorkManager", "listPref: ${listPref.value} - newValue: $newValue")
         val value = newValue as? String
-        Log.d("toggleWorkManager", "String value: $value")
+        Log.d("updateWorkManager", "String value: $value")
         if (value.isNullOrEmpty()) {
-            Log.w("toggleWorkManager", "NULL OR EMPTY - false")
+            Log.w("updateWorkManager", "NULL OR EMPTY - false")
             return false
-        } else if (pref.value != value) {
-            Log.i("toggleWorkManager", "RESCHEDULING WORK - true")
+        } else if (listPref.value == value) {
+            Log.i("updateWorkManager", "NO CHANGE - false")
+            return false
+        } else {
+            Log.i("updateWorkManager", "RESCHEDULING WORK - true")
             val interval = value.toLongOrNull()
-            Log.i("toggleWorkManager", "interval: $interval")
-            if (interval != null) {
+            Log.i("updateWorkManager", "interval: $interval")
+            if (interval == null || interval == 0L) {
+                Log.i("updateWorkManager", "DISABLING WORK")
+                WorkManager.getInstance(this).cancelUniqueWork("daily_worker")
+                return true
+            } else {
                 val newRequest =
                     PeriodicWorkRequestBuilder<DailyWorker>(interval, TimeUnit.MINUTES)
+                        .setInitialDelay(1, TimeUnit.MINUTES)
                         .setConstraints(DAILY_WORKER_CONSTRAINTS)
                         .build()
                 WorkManager.getInstance(this).enqueueUniquePeriodicWork(
@@ -238,14 +246,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
                     newRequest
                 )
                 return true
-            } else {
-                Log.i("toggleWorkManager", "DISABLING WORK - true")
-                WorkManager.getInstance(this).cancelUniqueWork("daily_worker")
-                return true
             }
-        } else {
-            Log.i("toggleWorkManager", "NO CHANGE - false")
-            return false
         }
     }