blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3711: Fixes save to collection from browser crash (#3714)

master
Sawyer Blatz 2019-06-27 11:29:00 -07:00 committed by GitHub
parent a36f2a7288
commit 13df8d7ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,29 @@ class HomeFragment : Fragment(), AccountObserver {
private lateinit var sessionObserver: BrowserSessionsObserver
private val collectionStorageObserver = object : TabCollectionStorage.Observer {
override fun onCollectionCreated(title: String, sessions: List<Session>) {
super.onCollectionCreated(title, sessions)
scrollAndAnimateCollection(sessions.size)
}
override fun onTabsAdded(
tabCollection: mozilla.components.feature.tab.collections.TabCollection,
sessions: List<Session>
) {
super.onTabsAdded(tabCollection, sessions)
scrollAndAnimateCollection(sessions.size, tabCollection)
}
override fun onCollectionRenamed(
tabCollection: mozilla.components.feature.tab.collections.TabCollection,
title: String
) {
super.onCollectionRenamed(tabCollection, title)
showRenamedSnackbar()
}
}
private var homeMenu: HomeMenu? = null
private val sessionManager: SessionManager
@ -297,9 +320,11 @@ class HomeFragment : Fragment(), AccountObserver {
override fun onStart() {
super.onStart()
requireComponents.core.tabCollectionStorage.register(collectionStorageObserver, this)
sessionObserver.onStart()
tabCollectionObserver = subscribeToTabCollections()
// We only want this observer live just before we navigate away to the collection creation screen
requireComponents.core.tabCollectionStorage.unregister(collectionStorageObserver)
}
override fun onStop() {
@ -676,6 +701,9 @@ class HomeFragment : Fragment(), AccountObserver {
viewModel?.saveCollectionStep =
step ?: viewModel?.getStepForTabsAndCollectionSize() ?: SaveCollectionStep.SelectTabs
// Only register the observer right before moving to collection creation
requireComponents.core.tabCollectionStorage.register(collectionStorageObserver, this)
view?.let {
val directions = HomeFragmentDirections.actionHomeFragmentToCreateCollectionFragment()
nav(R.id.homeFragment, directions)
@ -781,29 +809,6 @@ class HomeFragment : Fragment(), AccountObserver {
}
}
private val collectionStorageObserver = object : TabCollectionStorage.Observer {
override fun onCollectionCreated(title: String, sessions: List<Session>) {
super.onCollectionCreated(title, sessions)
scrollAndAnimateCollection(sessions.size)
}
override fun onTabsAdded(
tabCollection: mozilla.components.feature.tab.collections.TabCollection,
sessions: List<Session>
) {
super.onTabsAdded(tabCollection, sessions)
scrollAndAnimateCollection(sessions.size, tabCollection)
}
override fun onCollectionRenamed(
tabCollection: mozilla.components.feature.tab.collections.TabCollection,
title: String
) {
super.onCollectionRenamed(tabCollection, title)
showRenamedSnackbar()
}
}
private fun showSavedSnackbar(tabSize: Int) {
viewLifecycleOwner.lifecycleScope.launch {
delay(ANIM_SNACKBAR_DELAY)