Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-11 13:11:01 +00:00
Code Issues Releases Wiki Activity

For #3215: Restores collections properly (#3219)

Browse Source
This commit is contained in:
Sawyer Blatz 2019-06-06 12:26:06 -07:00 committed by Colin Lee
parent 4954aadd84
commit 8537ff10a8
1 changed files with 31 additions and 8 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

@ -401,7 +401,7 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
} }
} }
@Suppress("ComplexMethod") @Suppress("ComplexMethod", "NestedBlockDepth")
private fun handleCollectionAction(action: CollectionAction) { private fun handleCollectionAction(action: CollectionAction) {
when (action) { when (action) {
is CollectionAction.Expand -> { is CollectionAction.Expand -> {
@ -429,16 +429,39 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
} }
is CollectionAction.OpenTab -> { is CollectionAction.OpenTab -> {
invokePendingDeleteJobs() invokePendingDeleteJobs()
(activity as HomeActivity).openToBrowserAndLoad( context?.let { context ->
searchTermOrURL = action.tab.url, val tabSnapshot = action.tab.restore(context, requireComponents.core.engine, action.tab)
newTab = true, if (tabSnapshot.isEmpty()) {
from = BrowserDirection.FromHome // 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)
}
}
} }
is CollectionAction.OpenTabs -> { is CollectionAction.OpenTabs -> {
invokePendingDeleteJobs() invokePendingDeleteJobs()
action.collection.tabs.forEach { context?.let { context ->
requireComponents.useCases.tabsUseCases.addTab.invoke(it.url) 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
)
}
}
} }
} }
is CollectionAction.ShareTabs -> { is CollectionAction.ShareTabs -> {