admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate more preferences

Browse Source 
(cherry picked from commit 53a3be0703)
This commit is contained in:
Jobobby04
2020-05-01 22:16:04 -04:00
parent e97d1ac257
commit 24850450cb
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationBottomSheetDialog.kt
+1 -1
View File
@@ -94,7 +94,7 @@ class MigrationBottomSheetDialog(
}
sourceGroup.bindToPreference(preferences.useSourceWithMost())
skip_step.isChecked = preferences.skipPreMigration().getOrDefault()
skip_step.isChecked = preferences.skipPreMigration().get()
skip_step.setOnCheckedChangeListener { _, isChecked ->
if (isChecked)
(listener as? Controller)?.activity?.toast(R.string.pre_migration_skip_toast,
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
+2 -2
View File
@@ -129,7 +129,7 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController<PreMigrati
* @return list containing enabled sources.
*/
private fun getEnabledSources(): List<HttpSource> {
val languages = prefs.enabledLanguages().getOrDefault()
val languages = prefs.enabledLanguages().get()
val sourcesSaved = prefs.migrationSources().getOrDefault().split("/")
var sources = sourceManager.getVisibleCatalogueSources()
.filterIsInstance<HttpSource>()
@@ -146,7 +146,7 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController<PreMigrati
fun isEnabled(id: String): Boolean {
val sourcesSaved = prefs.migrationSources().getOrDefault()
val hiddenCatalogues = prefs.hiddenCatalogues().getOrDefault()
val hiddenCatalogues = prefs.hiddenCatalogues().get()
return if (sourcesSaved.isEmpty()) id !in hiddenCatalogues
else sourcesSaved.split("/").contains(id)
}
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+1 -1
View File
@@ -210,7 +210,7 @@ class SettingsLibraryController : SettingsController() {
true
}
}
if (preferences.skipPreMigration().getOrDefault() || preferences.migrationSources()
if (preferences.skipPreMigration().get() || preferences.migrationSources()
.getOrDefault().isNotEmpty()) {
switchPreference {
key = Keys.skipPreMigration