From 5bf424af40995c65772022d84f8cb1944d65f9fb Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 18 Oct 2021 09:54:09 -0400 Subject: [PATCH] Remove global update intervals below 12 hours, add every 3 day interval Users with smaller libraries have a lower change of getting updates frequently. "Power users" are actively hurting sources by updating frequently. (cherry picked from commit 9e2ef82902369908503e860af12e8536a004bd43) # Conflicts: # app/build.gradle.kts --- app/build.gradle.kts | 2 +- app/src/main/java/eu/kanade/tachiyomi/Migrations.kt | 8 ++++++++ .../tachiyomi/ui/setting/SettingsLibraryController.kt | 7 ++----- app/src/main/java/exh/EXHMigrations.kt | 8 ++++++++ app/src/main/res/values/strings.xml | 4 +--- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0c2e63c17..46c1f3700 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,7 +33,7 @@ android { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - versionCode = 21 + versionCode = 22 versionName = "1.7.0" buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt index 07f9c3ac1..48b07cb64 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt @@ -237,6 +237,14 @@ object Migrations { preferences.enabledLanguages() += "all" } } + if (oldVersion < 71) { + // Handle removed every 3, 4, 6, and 8 hour library updates + val updateInterval = preferences.libraryUpdateInterval().get() + if (updateInterval in listOf(3, 4, 6, 8)) { + preferences.libraryUpdateInterval().set(12) + LibraryUpdateJob.setupTask(context, 12) + } + } 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 41ca0ac07..79f8f81b1 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 @@ -165,16 +165,13 @@ class SettingsLibraryController : SettingsController() { titleRes = R.string.pref_library_update_interval entriesRes = arrayOf( R.string.update_never, - R.string.update_3hour, - R.string.update_4hour, - R.string.update_6hour, - R.string.update_8hour, R.string.update_12hour, R.string.update_24hour, R.string.update_48hour, + R.string.update_72hour, R.string.update_weekly ) - entryValues = arrayOf("0", "3", "4", "6", "8", "12", "24", "48", "168") + entryValues = arrayOf("0", "12", "24", "48", "72", "168") defaultValue = "24" summary = "%s" diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index 23dfbf6c3..4c8d21333 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -337,6 +337,14 @@ object EXHMigrations { // preferences.lang().set("en") // } } + if (oldVersion under 22) { + // Handle removed every 3, 4, 6, and 8 hour library updates + val updateInterval = preferences.libraryUpdateInterval().get() + if (updateInterval in listOf(3, 4, 6, 8)) { + preferences.libraryUpdateInterval().set(12) + LibraryUpdateJob.setupTask(context, 12) + } + } // if (oldVersion under 1) { } (1 is current release version) // do stuff here when releasing changed crap diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e7ed311b..bd8cd434e 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -211,13 +211,11 @@ Global update Update frequency Manual - Every 3 hours - Every 4 hours Every 6 hours - Every 8 hours Every 12 hours Daily Every 2 days + Every 3 days Weekly Update order Update restrictions