From 579c79d7f4dde3209e30678d5a1322391cd77de9 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sun, 31 Oct 2021 01:44:06 -0400 Subject: [PATCH] AutoUpdaterJob -> AutoAppUpdaterJob This was missed before --- .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 8 ++++---- .../java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt | 4 ++-- .../updater/{AutoUpdaterJob.kt => AutoAppUpdaterJob.kt} | 4 ++-- .../eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt | 6 +++--- .../tachiyomi/ui/setting/SettingsBrowseController.kt | 4 ++-- .../tachiyomi/ui/setting/SettingsGeneralController.kt | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) rename app/src/main/java/eu/kanade/tachiyomi/data/updater/{AutoUpdaterJob.kt => AutoAppUpdaterJob.kt} (93%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index f661405e37..839499df4d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -11,7 +11,7 @@ import com.tfcporciuncula.flow.Preference import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.track.TrackService -import eu.kanade.tachiyomi.data.updater.AutoUpdaterJob +import eu.kanade.tachiyomi.data.updater.AutoAppUpdaterJob import eu.kanade.tachiyomi.extension.model.InstalledExtensionsOrder import eu.kanade.tachiyomi.ui.library.filter.FilterBottomSheet import eu.kanade.tachiyomi.ui.reader.settings.OrientationType @@ -101,7 +101,7 @@ class PreferencesHelper(val context: Context) { fun themeDarkAmoled() = flowPrefs.getBoolean(Keys.themeDarkAmoled, false) - val isOnA12 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + private val isOnA12 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S fun lightTheme() = flowPrefs.getEnum(Keys.lightTheme, if (isOnA12) Themes.MONET else Themes.DEFAULT) fun darkTheme() = flowPrefs.getEnum(Keys.darkTheme, if (isOnA12) Themes.MONET else Themes.DEFAULT) @@ -418,9 +418,9 @@ class PreferencesHelper(val context: Context) { fun sideNavMode() = flowPrefs.getInt(Keys.sideNavMode, 0) - fun appShouldAutoUpdate() = prefs.getInt(Keys.shouldAutoUpdate, AutoUpdaterJob.ONLY_ON_UNMETERED) + fun appShouldAutoUpdate() = prefs.getInt(Keys.shouldAutoUpdate, AutoAppUpdaterJob.ONLY_ON_UNMETERED) - fun autoUpdateExtensions() = prefs.getInt(Keys.autoUpdateExtensions, AutoUpdaterJob.ONLY_ON_UNMETERED) + fun autoUpdateExtensions() = prefs.getInt(Keys.autoUpdateExtensions, AutoAppUpdaterJob.ONLY_ON_UNMETERED) fun filterChapterByRead() = flowPrefs.getInt(Keys.defaultChapterFilterByRead, Manga.SHOW_ALL) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt index 3b8a323a4e..ee88673d5c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateJob.kt @@ -26,9 +26,9 @@ class AppUpdateJob(private val context: Context, workerParams: WorkerParameters) val result = AppUpdateChecker.getUpdateChecker().checkForUpdate() if (result is AppUpdateResult.NewUpdate<*>) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && - preferences.appShouldAutoUpdate() != AutoUpdaterJob.NEVER + preferences.appShouldAutoUpdate() != AutoAppUpdaterJob.NEVER ) { - AutoUpdaterJob.setupTask(context) + AutoAppUpdaterJob.setupTask(context) } AppUpdateNotifier(context).promptUpdate( result.release.info, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AutoUpdaterJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AutoAppUpdaterJob.kt similarity index 93% rename from app/src/main/java/eu/kanade/tachiyomi/data/updater/AutoUpdaterJob.kt rename to app/src/main/java/eu/kanade/tachiyomi/data/updater/AutoAppUpdaterJob.kt index 0b1b7a0c86..741fc8abc2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/AutoUpdaterJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/AutoAppUpdaterJob.kt @@ -14,7 +14,7 @@ import kotlinx.coroutines.coroutineScope import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -class AutoUpdaterJob(private val context: Context, workerParams: WorkerParameters) : +class AutoAppUpdaterJob(private val context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams) { override suspend fun doWork(): Result = coroutineScope { @@ -57,7 +57,7 @@ class AutoUpdaterJob(private val context: Context, workerParams: WorkerParameter .setRequiresDeviceIdle(true) .build() - val request = OneTimeWorkRequestBuilder() + val request = OneTimeWorkRequestBuilder() .addTag(TAG) .setConstraints(constraints) .build() diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt index da053865ea..6cd0093bc6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionUpdateJob.kt @@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateService import eu.kanade.tachiyomi.data.notification.NotificationReceiver import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.data.updater.AutoUpdaterJob +import eu.kanade.tachiyomi.data.updater.AutoAppUpdaterJob import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.util.system.connectivityManager @@ -61,7 +61,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && inputData.getBoolean(RUN_AUTO, true) && - preferences.autoUpdateExtensions() != AutoUpdaterJob.NEVER && + preferences.autoUpdateExtensions() != AutoAppUpdaterJob.NEVER && !ExtensionInstallService.isRunning() && extensionsInstalledByApp.isNotEmpty() ) { @@ -69,7 +69,7 @@ class ExtensionUpdateJob(private val context: Context, workerParams: WorkerParam val libraryServiceRunning = LibraryUpdateService.isRunning() if ( ( - preferences.autoUpdateExtensions() == AutoUpdaterJob.ALWAYS || + preferences.autoUpdateExtensions() == AutoAppUpdaterJob.ALWAYS || !cm.isActiveNetworkMetered ) && !libraryServiceRunning ) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt index 5c5eb315ec..73c8801ba7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.data.preference.asImmediateFlowIn -import eu.kanade.tachiyomi.data.updater.AutoUpdaterJob +import eu.kanade.tachiyomi.data.updater.AutoAppUpdaterJob import eu.kanade.tachiyomi.extension.ExtensionUpdateJob import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.ui.main.MainActivity @@ -51,7 +51,7 @@ class SettingsBrowseController : SettingsController() { R.string.over_wifi_only, R.string.dont_auto_update ) - defaultValue = AutoUpdaterJob.ONLY_ON_UNMETERED + defaultValue = AutoAppUpdaterJob.ONLY_ON_UNMETERED } val infoPref = infoPreference(R.string.some_extensions_may_not_update) val switchPref = switchPreference { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index a048a6a70a..9cf29a3e84 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -6,7 +6,7 @@ import android.view.View import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.data.updater.AutoUpdaterJob +import eu.kanade.tachiyomi.data.updater.AutoAppUpdaterJob import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys class SettingsGeneralController : SettingsController() { @@ -97,7 +97,7 @@ class SettingsGeneralController : SettingsController() { titleRes = R.string.auto_update_app entryRange = 0..2 entriesRes = arrayOf(R.string.over_any_network, R.string.over_wifi_only, R.string.dont_auto_update) - defaultValue = AutoUpdaterJob.ONLY_ON_UNMETERED + defaultValue = AutoAppUpdaterJob.ONLY_ON_UNMETERED } } }