From eaa2bb22ed7e807936534fcd22f4c64cd676b3be Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 22 May 2021 11:52:28 -0400 Subject: [PATCH] Remove 1 or 2 hour library updates to avoid DDoSing sources (cherry picked from commit 569df39fb88e534fa0deb5b9a412f84936006859) # Conflicts: # app/build.gradle.kts --- app/src/main/java/eu/kanade/tachiyomi/Migrations.kt | 8 ++++++++ .../ui/setting/SettingsLibraryController.kt | 4 +--- app/src/main/java/exh/EXHMigrations.kt | 12 +++++++----- app/src/main/res/values/strings.xml | 2 -- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 753ae2ab8..d8fc7092c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -179,6 +179,14 @@ object Migrations { remove("pref_default_viewer_key") } } + if (oldVersion < 61) { + // Handle removed every 1 or 2 hour library updates + val updateInterval = preferences.libraryUpdateInterval().get() + if (updateInterval == 1 || updateInterval == 2) { + preferences.libraryUpdateInterval().set(3) + LibraryUpdateJob.setupTask(context, 3) + } + } return true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index 9094bad98..ad5f9e99c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -150,8 +150,6 @@ class SettingsLibraryController : SettingsController() { titleRes = R.string.pref_library_update_interval entriesRes = arrayOf( R.string.update_never, - R.string.update_1hour, - R.string.update_2hour, R.string.update_3hour, R.string.update_4hour, R.string.update_6hour, @@ -161,7 +159,7 @@ class SettingsLibraryController : SettingsController() { R.string.update_48hour, R.string.update_weekly ) - entryValues = arrayOf("0", "1", "2", "3", "4", "6", "8", "12", "24", "48", "168") + entryValues = arrayOf("0", "3", "4", "6", "8", "12", "24", "48", "168") defaultValue = "24" summary = "%s" diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index 2ec9abc0f..1a5169121 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -276,12 +276,14 @@ object EXHMigrations { ) } if (oldVersion under 18) { - val prefs = PreferenceManager.getDefaultSharedPreferences(context) - val readerTheme = prefs.getInt("pref_reader_theme_key", 3) + val readerTheme = preferences.readerTheme().get() if (readerTheme == 4) { - prefs.edit { - putInt("pref_reader_theme_key", 3) - } + preferences.readerTheme().set(3) + } + val updateInterval = preferences.libraryUpdateInterval().get() + if (updateInterval == 1 || updateInterval == 2) { + preferences.libraryUpdateInterval().set(3) + LibraryUpdateJob.setupTask(context, 3) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b3007395..2b86526cf 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -201,8 +201,6 @@ Global update Update frequency Manual - Hourly - Every 2 hours Every 3 hours Every 4 hours Every 6 hours