From 2b766863f557b65ba4fc104904dae9264d1d8dbd Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 28 May 2022 09:12:15 -0400 Subject: [PATCH] Minor cleanups (cherry picked from commit 3c40010afffa807017f0b56634d8c5323154b4e4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt --- .../eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt | 6 +++++- app/src/main/res/values/strings.xml | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt index 43f8d538d..fb14b3ce7 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt @@ -8,7 +8,11 @@ import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.Worker import androidx.work.WorkerParameters -import eu.kanade.tachiyomi.data.preference.* +import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW +import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING +import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED +import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI +import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.util.system.isConnectedToWifi import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 37db31153..1f0e6655d 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -221,9 +221,9 @@ Weekly Automatic updates device restrictions Only on Wi-Fi - Only on unmetered Network - Charging - Battery not low + Only on unmetered network + When charging + When battery not low Restrictions: %s Skip updating titles