Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix migration dialog showing on startup even with no manga

Browse Source
This commit is contained in:
NerdNumber9 2017-08-25 22:26:57 -04:00
parent 08dffda2a1
commit bcc2ec1668
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -170,7 +170,7 @@ class MainActivity : BaseActivity() {
// Migrate metadata to Realm (EH) // Migrate metadata to Realm (EH)
if(!preferences.migrateLibraryAsked2().getOrDefault()) if(!preferences.migrateLibraryAsked2().getOrDefault())
MetadataFetchDialog().askMigration(this) MetadataFetchDialog().askMigration(this, false)
} }
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
View File

@ -137,7 +137,7 @@ class SettingsEhController : SettingsController() {
onClick { onClick {
activity?.let { activity?.let {
MetadataFetchDialog().askMigration(it) MetadataFetchDialog().askMigration(it, true)
} }
} }
} }

7
app/src/main/java/exh/ui/migration/MetadataFetchDialog.kt
View File

@ -83,9 +83,13 @@ class MetadataFetchDialog {
} }
} }
fun askMigration(activity: Activity) { fun askMigration(activity: Activity, explicit: Boolean) {
var extra = "" var extra = ""
db.getLibraryMangas().asRxSingle().subscribe { db.getLibraryMangas().asRxSingle().subscribe {
if(!explicit && it.isEmpty()) {
//Do not open dialog on startup if no manga
preferenceHelper.migrateLibraryAsked2().set(true)
} else {
//Not logged in but have ExHentai galleries //Not logged in but have ExHentai galleries
if (!preferenceHelper.enableExhentai().getOrDefault()) { if (!preferenceHelper.enableExhentai().getOrDefault()) {
it.find { isExSource(it.source) }?.let { it.find { isExSource(it.source) }?.let {
@ -110,6 +114,7 @@ class MetadataFetchDialog {
}.show() }.show()
} }
} }
}
} }