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

Avoid crash if activity is already dead

Browse Source 
(cherry picked from commit 2e2663bad9)
This commit is contained in:
arkon
2021-02-12 16:55:14 -05:00
committed by Jobobby04
parent fd65aa8fe4
commit 7d1fd9f0bb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+2 -2
View File
@@ -253,7 +253,7 @@ class LibraryController(
} }
.launchIn(viewScope) .launchIn(viewScope)
(activity!! as MainActivity).fixViewToBottom(binding.actionToolbar) (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
} }
override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
@@ -266,7 +266,7 @@ class LibraryController(
override fun onDestroyView(view: View) { override fun onDestroyView(view: View) {
destroyActionModeIfNeeded() destroyActionModeIfNeeded()
(activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar) (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
binding.actionToolbar.destroy() binding.actionToolbar.destroy()
adapter?.onDestroy() adapter?.onDestroy()
adapter = null adapter = null
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+2 -2
View File
@@ -342,7 +342,7 @@ class MangaController :
} }
.launchIn(viewScope) .launchIn(viewScope)
(activity!! as MainActivity).fixViewToBottom(binding.actionToolbar) (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
settingsSheet = ChaptersSettingsSheet(router, presenter) { group -> settingsSheet = ChaptersSettingsSheet(router, presenter) { group ->
if (group is ChaptersSettingsSheet.Filter.FilterGroup) { if (group is ChaptersSettingsSheet.Filter.FilterGroup) {
@@ -429,7 +429,7 @@ class MangaController :
override fun onDestroyView(view: View) { override fun onDestroyView(view: View) {
destroyActionModeIfNeeded() destroyActionModeIfNeeded()
(activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar) (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
binding.actionToolbar.destroy() binding.actionToolbar.destroy()
mangaInfoAdapter = null mangaInfoAdapter = null
chaptersHeaderAdapter = null chaptersHeaderAdapter = null
app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
+2 -2
View File
@@ -109,12 +109,12 @@ class UpdatesController :
} }
.launchIn(viewScope) .launchIn(viewScope)
(activity!! as MainActivity).fixViewToBottom(binding.actionToolbar) (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar)
} }
override fun onDestroyView(view: View) { override fun onDestroyView(view: View) {
destroyActionModeIfNeeded() destroyActionModeIfNeeded()
(activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar) (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar)
binding.actionToolbar.destroy() binding.actionToolbar.destroy()
adapter = null adapter = null
super.onDestroyView(view) super.onDestroyView(view)