Fix the wallpaper changer behavior

you-apps · Oct 23, 2022 · 2f81ff4 · 2f81ff4
1 parent d4c2de1
commit 2f81ff4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/com/bnyro/wallpaper/ui/pages/SettingsPage.kt b/app/src/main/java/com/bnyro/wallpaper/ui/pages/SettingsPage.kt
@@ -101,11 +101,7 @@ fun SettingsPage(
                 prefKey = Preferences.wallpaperChangerKey,
                 title = stringResource(R.string.wallpaper_changer)
             ) {
-                if (it) {
-                    WorkerHelper.enqueue(context, true)
-                } else {
-                    WorkerHelper.cancel(context)
-                }
+                WorkerHelper.enqueue(context, true)
             }
             ListPreference(
                 prefKey = Preferences.wallpaperChangerIntervalKey,

diff --git a/app/src/main/java/com/bnyro/wallpaper/util/WorkerHelper.kt b/app/src/main/java/com/bnyro/wallpaper/util/WorkerHelper.kt
@@ -12,6 +12,11 @@ object WorkerHelper {
     private const val JOB_NAME = "WallpaperChanger"
 
     fun enqueue(context: Context, verbose: Boolean = false) {
+        if (!Preferences.getBoolean(Preferences.wallpaperChangerKey, false)) {
+            cancel(context)
+            return
+        }
+
         val job = PeriodicWorkRequestBuilder<BackgroundWorker>(
             Preferences.getString(
                 Preferences.wallpaperChangerIntervalKey,