From 2f81ff4bdfa6bc9fb44387f15c935b15920710af Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 23 Oct 2022 09:33:11 +0200
Subject: [PATCH] Fix the wallpaper changer behavior

---
 .../main/java/com/bnyro/wallpaper/ui/pages/SettingsPage.kt  | 6 +-----
 app/src/main/java/com/bnyro/wallpaper/util/WorkerHelper.kt  | 5 +++++
 2 files changed, 6 insertions(+), 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
index f066032d..0adfa5b9 100644
--- 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
index d8b6777c..a4bbe208 100644
--- 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,