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

Fix crash when opening chapter from migration

Browse Source 
(cherry picked from commit 77d378ccd1559617af08a8f067d81f5028f5c7e2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
This commit is contained in:
arkon 2020-05-30 23:16:17 -04:00 committed by Jobobby04
parent 68c2284386
commit 6647db747f
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
View File

@ -10,7 +10,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.databinding.MigrationMangaControllerBinding
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController
import eu.kanade.tachiyomi.ui.browse.source.SourceDividerItemDecoration
@ -24,23 +23,28 @@ class MigrationMangaController :
private var adapter: FlexibleAdapter<IFlexible<*>>? = null
constructor(source: Source) : super(
constructor(sourceId: Long, sourceName: String?) : super(
Bundle().apply {
putSerializable(SOURCE_EXTRA, source)
putLong(SOURCE_ID_EXTRA, sourceId)
putString(SOURCE_NAME_EXTRA, sourceName)
}
)
@Suppress("unused")
constructor(bundle: Bundle) : this(bundle.getSerializable(SOURCE_EXTRA) as Source)
constructor(bundle: Bundle) : this(
bundle.getLong(SOURCE_ID_EXTRA),
bundle.getString(SOURCE_NAME_EXTRA)
)
private val source: Source = args.getSerializable(SOURCE_EXTRA) as Source
private val sourceId: Long = args.getLong(SOURCE_ID_EXTRA)
private val sourceName: String? = args.getString(SOURCE_NAME_EXTRA)
override fun getTitle(): String? {
return source.name
return sourceName
}
override fun createPresenter(): MigrationMangaPresenter {
return MigrationMangaPresenter(source.id)
return MigrationMangaPresenter(sourceId)
}
override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
@ -84,7 +88,8 @@ class MigrationMangaController :
}
companion object {
const val SOURCE_EXTRA = "source_id_extra"
const val SOURCE_ID_EXTRA = "source_id_extra"
const val SOURCE_NAME_EXTRA = "source_name_extra"
}
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
View File

@ -64,7 +64,7 @@ class MigrationSourcesController :
override fun onItemClick(view: View?, position: Int): Boolean {
val item = adapter?.getItem(position) as? SourceItem ?: return false
val controller = MigrationMangaController(item.source)
val controller = MigrationMangaController(item.source.id, item.source.name)
if (parentController is BrowseController) {
parentController!!.router.pushController(controller.withFadeTransaction())
} else {