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

Avoid some crashes if router backstack is empty for whatever reason

Browse Source 
(cherry picked from commit c284a23afb4d0eea9b5547b09182d238eca48a6d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
This commit is contained in:
arkon 2022-02-13 11:10:13 -05:00 committed by Jobobby04
parent c293fd61b1
commit 286844e56d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ class BrowseController :
/* It's possible to switch to the Library controller by the time setExtensionUpdateBadge
is called, resulting in a badge being put on the category tabs (if enabled).
This check prevents that from happening */
if (router.backstack.last().controller !is BrowseController) return
if (router.backstack.lastOrNull()?.controller !is BrowseController) return
(activity as? MainActivity)?.binding?.tabs?.apply {
val updates = preferences.extensionUpdatesCount().get()

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

@ -463,7 +463,7 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
}
SHORTCUT_MANGA -> {
val extras = intent.extras ?: return false
val fgController = router.backstack.last()?.controller as? MangaController
val fgController = router.backstack.lastOrNull()?.controller as? MangaController
if (fgController?.manga?.id != extras.getLong(MangaController.MANGA_EXTRA)) {
router.popToRoot()
setSelectedNavItem(R.id.nav_library)