From ad2d2072de0fe8b15df8402c0cc68c7e56db8fd1 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Mon, 15 Jul 2019 18:58:33 +0200 Subject: [PATCH] [fenix] Use updated feature-tab-collections API. (https://github.com/mozilla-mobile/fenix/pull/4056) --- .../java/org/mozilla/fenix/home/HomeFragment.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index c195e5c905..608554e209 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -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 ) }