From 02586404d7dbd18ec3cc75a9697947a0fa72c0af Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 18 Jul 2021 15:00:07 -0400 Subject: [PATCH] Remove autoAddTrack preference (cherry picked from commit dce30494467429a0c578386508f1c253fc6d7799) --- .../eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 -- .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 2 -- .../ui/browse/source/browse/BrowseSourcePresenter.kt | 4 +--- .../java/eu/kanade/tachiyomi/ui/manga/MangaController.kt | 2 +- .../tachiyomi/ui/setting/SettingsTrackingController.kt | 6 ------ app/src/main/res/values/strings.xml | 3 +-- 6 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 64f4fa5de..7862273fd 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -101,8 +101,6 @@ object PreferenceKeys { const val autoUpdateTrack = "pref_auto_update_manga_sync_key" - const val autoAddTrack = "pref_auto_add_track_key" - const val lastUsedSource = "last_catalogue_source" const val lastUsedCategory = "last_used_category" 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 40af964ad..7f9e5d1a8 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -181,8 +181,6 @@ class PreferencesHelper(val context: Context) { fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true) - fun autoAddTrack() = prefs.getBoolean(Keys.autoAddTrack, true) - fun lastUsedSource() = flowPrefs.getLong(Keys.lastUsedSource, -1) fun lastUsedCategory() = flowPrefs.getInt(Keys.lastUsedCategory, 0) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt index 85ff9e5b4..72716ff09 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt @@ -303,9 +303,7 @@ open class BrowseSourcePresenter( } else { ChapterSettingsHelper.applySettingDefaults(manga) - if (prefs.autoAddTrack()) { - autoAddTrack(manga) - } + autoAddTrack(manga) } db.insertManga(manga).executeAsBlocking() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index d5b073b61..b2a6c22ed 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -712,7 +712,7 @@ class MangaController : } } - if (source != null && preferences.autoAddTrack()) { + if (source != null) { presenter.trackList .map { it.service } .filterIsInstance() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt index f6dc9e775..1305dab49 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt @@ -76,12 +76,6 @@ class SettingsTrackingController : preferenceCategory { titleRes = R.string.enhanced_services - switchPreference { - key = Keys.autoAddTrack - titleRes = R.string.pref_auto_add_track - defaultValue = true - } - trackPreference(trackManager.komga) { val acceptedSources = trackManager.komga.getAcceptedSources() val hasValidSourceInstalled = sourceManager.getCatalogueSources() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6483f16f6..c4fbbaf3e 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -385,8 +385,7 @@ Services One-way sync to update the chapter progress in tracking services. Set up tracking for individual manga entries from their tracking button. Enhanced services - Automatically track manga when added to library - Services that provide enhanced features for specific sources. + Services that provide enhanced features for specific sources. Manga are automatically tracked when added to your library. Check for extension updates