Change global update unmetered connection restriction to connected to Wi-Fi (closes #6117)

This commit is contained in:
arkon
2021-10-16 11:10:05 -04:00
parent 3d8f123e05
commit 8a70c3353f
6 changed files with 23 additions and 20 deletions

View File

@@ -66,7 +66,7 @@ class SettingsDownloadController : SettingsController() {
}
switchPreference {
key = Keys.downloadOnlyOverWifi
titleRes = R.string.pref_download_only_over_wifi
titleRes = R.string.connected_to_wifi
defaultValue = true
}
preferenceCategory {

View File

@@ -12,8 +12,8 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Category
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
import eu.kanade.tachiyomi.data.preference.CHARGING
import eu.kanade.tachiyomi.data.preference.ONLY_ON_WIFI
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.UNMETERED_NETWORK
import eu.kanade.tachiyomi.data.preference.asImmediateFlow
import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.databinding.PrefLibraryColumnsBinding
@@ -161,9 +161,9 @@ class SettingsLibraryController : SettingsController() {
multiSelectListPreference {
key = Keys.libraryUpdateRestriction
titleRes = R.string.pref_library_update_restriction
entriesRes = arrayOf(R.string.network_unmetered, R.string.charging)
entryValues = arrayOf(UNMETERED_NETWORK, CHARGING)
defaultValue = setOf(UNMETERED_NETWORK)
entriesRes = arrayOf(R.string.connected_to_wifi, R.string.charging)
entryValues = arrayOf(ONLY_ON_WIFI, CHARGING)
defaultValue = setOf(ONLY_ON_WIFI)
preferences.libraryUpdateInterval().asImmediateFlow { isVisible = it > 0 }
.launchIn(viewScope)
@@ -179,7 +179,7 @@ class SettingsLibraryController : SettingsController() {
.sorted()
.map {
when (it) {
UNMETERED_NETWORK -> context.getString(R.string.network_unmetered)
ONLY_ON_WIFI -> context.getString(R.string.connected_to_wifi)
CHARGING -> context.getString(R.string.charging)
else -> it
}