blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3818: Handle crashes accessing view after onDestroyView (#3942)

master
Colin Lee 2019-07-08 18:42:17 -05:00 committed by GitHub
parent 83312b38aa
commit 5a204f0bbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -120,11 +120,13 @@ class HomeFragment : Fragment(), AccountObserver {
private val preDrawListener = object : ViewTreeObserver.OnPreDrawListener { private val preDrawListener = object : ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean { override fun onPreDraw(): Boolean {
viewLifecycleOwner.lifecycleScope.launch { if (view != null) {
delay(ANIM_SCROLL_DELAY) viewLifecycleOwner.lifecycleScope.launch {
restoreLayoutState() delay(ANIM_SCROLL_DELAY)
restoreLayoutState()
// startPostponedEnterTransition() // startPostponedEnterTransition()
}.invokeOnCompletion { sessionControlComponent.view.viewTreeObserver.removeOnPreDrawListener(this) } }.invokeOnCompletion { sessionControlComponent.view.viewTreeObserver.removeOnPreDrawListener(this) }
}
return true return true
} }
} }
@ -753,37 +755,40 @@ class HomeFragment : Fragment(), AccountObserver {
} }
private fun scrollAndAnimateCollection(tabsAddedToCollectionSize: Int, changedCollection: TabCollection? = null) { private fun scrollAndAnimateCollection(tabsAddedToCollectionSize: Int, changedCollection: TabCollection? = null) {
viewLifecycleOwner.lifecycleScope.launch { if (view != null) {
val recyclerView = sessionControlComponent.view viewLifecycleOwner.lifecycleScope.launch {
delay(ANIM_SCROLL_DELAY) val recyclerView = sessionControlComponent.view
val tabsSize = getListOfSessions().size delay(ANIM_SCROLL_DELAY)
val tabsSize = getListOfSessions().size
var indexOfCollection = tabsSize + NON_TAB_ITEM_NUM var indexOfCollection = tabsSize + NON_TAB_ITEM_NUM
changedCollection?.let { changedCollection -> changedCollection?.let { changedCollection ->
requireComponents.core.tabCollectionStorage.cachedTabCollections.filterIndexed { index, tabCollection -> requireComponents.core.tabCollectionStorage.cachedTabCollections
if (tabCollection.id == changedCollection.id) { .filterIndexed { index, tabCollection ->
indexOfCollection = tabsSize + NON_TAB_ITEM_NUM + index if (tabCollection.id == changedCollection.id) {
return@filterIndexed true indexOfCollection = tabsSize + NON_TAB_ITEM_NUM + index
} return@filterIndexed true
false }
false
}
} }
} val lastVisiblePosition =
val lastVisiblePosition = (recyclerView.layoutManager as? LinearLayoutManager)?.findLastCompletelyVisibleItemPosition() ?: 0
(recyclerView.layoutManager as? LinearLayoutManager)?.findLastCompletelyVisibleItemPosition() ?: 0 if (lastVisiblePosition < indexOfCollection) {
if (lastVisiblePosition < indexOfCollection) { val onScrollListener = object : RecyclerView.OnScrollListener() {
val onScrollListener = object : RecyclerView.OnScrollListener() { override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { super.onScrollStateChanged(recyclerView, newState)
super.onScrollStateChanged(recyclerView, newState) if (newState == SCROLL_STATE_IDLE) {
if (newState == SCROLL_STATE_IDLE) { animateCollection(tabsAddedToCollectionSize, indexOfCollection)
animateCollection(tabsAddedToCollectionSize, indexOfCollection) recyclerView.removeOnScrollListener(this)
recyclerView.removeOnScrollListener(this) }
} }
} }
recyclerView.addOnScrollListener(onScrollListener)
recyclerView.smoothScrollToPosition(indexOfCollection)
} else {
animateCollection(tabsAddedToCollectionSize, indexOfCollection)
} }
recyclerView.addOnScrollListener(onScrollListener)
recyclerView.smoothScrollToPosition(indexOfCollection)
} else {
animateCollection(tabsAddedToCollectionSize, indexOfCollection)
} }
} }
} }