blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3280: Revert "For #3215: Restores collections properly" (#3320) 

This reverts commit 3e9ee79c00f4a6b34af74ce7c179e0cbe37decf5.
master
Sawyer Blatz 2019-06-10 13:54:03 -07:00 committed by GitHub
parent 5df726715f
commit ab000d2e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,7 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
}
}
@Suppress("ComplexMethod", "NestedBlockDepth")
@Suppress("ComplexMethod")
private fun handleCollectionAction(action: CollectionAction) {
when (action) {
is CollectionAction.Expand -> {
@ -447,39 +447,16 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
}
is CollectionAction.OpenTab -> {
invokePendingDeleteJobs()
context?.let { context ->
val tabSnapshot = action.tab.restore(context, requireComponents.core.engine, action.tab)
if (tabSnapshot.isEmpty()) {
// We were unable to create a snapshot, so just load the tab instead
(activity as HomeActivity).openToBrowserAndLoad(
searchTermOrURL = action.tab.url,
newTab = true,
from = BrowserDirection.FromHome
)
} else {
requireComponents.core.sessionManager.restore(
tabSnapshot,
true
)
(activity as HomeActivity).openToBrowser(BrowserDirection.FromHome)
}
}
(activity as HomeActivity).openToBrowserAndLoad(
searchTermOrURL = action.tab.url,
newTab = true,
from = BrowserDirection.FromHome
)
}
is CollectionAction.OpenTabs -> {
invokePendingDeleteJobs()
context?.let { context ->
action.collection.tabs.forEach {
val tabSnapshot = it.restore(context, requireComponents.core.engine, it)
if (tabSnapshot.isEmpty()) {
// We were unable to create a snapshot, so just load the tab instead
requireComponents.useCases.tabsUseCases.addTab.invoke(it.url)
} else {
requireComponents.core.sessionManager.restore(
tabSnapshot,
requireComponents.core.sessionManager.selectedSession == null
)
}
}
action.collection.tabs.forEach {
requireComponents.useCases.tabsUseCases.addTab.invoke(it.url)
}
}
is CollectionAction.ShareTabs -> {