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

Use updated feature-tab-collections API. (#4056)

Browse Source
This commit is contained in:
Sebastian Kaspari 2019-07-15 18:58:33 +02:00 committed by Sawyer Blatz
parent b91895a81c
commit f8ef0225e1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,13 +496,13 @@ class HomeFragment : Fragment(), AccountObserver {
}
is CollectionAction.OpenTab -> {
invokePendingDeleteJobs()
val tabSnapshot = action.tab.restore(
val session = action.tab.restore(
context = context!!,
engine = requireComponents.core.engine,
tab = action.tab,
restoreSessionId = false
)
if (tabSnapshot.isEmpty()) {
if (session == null) {
// We were unable to create a snapshot, so just load the tab instead
(activity as HomeActivity).openToBrowserAndLoad(
searchTermOrURL = action.tab.url,
@ -510,8 +510,8 @@ class HomeFragment : Fragment(), AccountObserver {
from = BrowserDirection.FromHome
)
} else {
requireComponents.core.sessionManager.restore(
tabSnapshot,
requireComponents.core.sessionManager.add(
session,
true
)
(activity as HomeActivity).openToBrowser(BrowserDirection.FromHome)
@ -520,18 +520,18 @@ class HomeFragment : Fragment(), AccountObserver {
is CollectionAction.OpenTabs -> {
invokePendingDeleteJobs()
action.collection.tabs.forEach {
val tabSnapshot = it.restore(
val session = it.restore(
context = context!!,
engine = requireComponents.core.engine,
tab = it,
restoreSessionId = false
)
if (tabSnapshot.isEmpty()) {
if (session == null) {
// 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.add(
session,
requireComponents.core.sessionManager.selectedSession == null
)
}