From 0761f391fc3ee909f031261ec2f088f1e1b7410d Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Mon, 11 Jan 2021 18:17:15 +0100 Subject: [PATCH] Update to latest feature-intent and feature-recentlyclosed APIs (and update Android Components). --- .../fenix/components/IntentProcessors.kt | 4 +- .../recentlyclosed/RecentlyClosedAdapter.kt | 10 ++--- .../RecentlyClosedController.kt | 43 ++++++++++--------- .../recentlyclosed/RecentlyClosedFragment.kt | 9 ++-- .../RecentlyClosedFragmentInteractor.kt | 14 +++--- .../RecentlyClosedFragmentStore.kt | 6 +-- .../RecentlyClosedFragmentView.kt | 18 ++++---- .../RecentlyClosedItemViewHolder.kt | 6 +-- .../DefaultRecentlyClosedControllerTest.kt | 32 ++++++-------- .../RecentlyClosedFragmentInteractorTest.kt | 14 +++--- buildSrc/src/main/java/AndroidComponents.kt | 2 +- 11 files changed, 76 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt index dd92f560d8..25bce31633 100644 --- a/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt +++ b/app/src/main/java/org/mozilla/fenix/components/IntentProcessors.kt @@ -45,14 +45,14 @@ class IntentProcessors( * Provides intent processing functionality for ACTION_VIEW and ACTION_SEND intents. */ val intentProcessor by lazyMonitored { - TabIntentProcessor(sessionManager, sessionUseCases.loadUrl, searchUseCases.newTabSearch, isPrivate = false) + TabIntentProcessor(tabsUseCases, sessionUseCases.loadUrl, searchUseCases.newTabSearch, isPrivate = false) } /** * Provides intent processing functionality for ACTION_VIEW and ACTION_SEND intents in private tabs. */ val privateIntentProcessor by lazyMonitored { - TabIntentProcessor(sessionManager, sessionUseCases.loadUrl, searchUseCases.newTabSearch, isPrivate = true) + TabIntentProcessor(tabsUseCases, sessionUseCases.loadUrl, searchUseCases.newTabSearch, isPrivate = true) } val customTabIntentProcessor by lazyMonitored { diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedAdapter.kt index 12ee4590b7..67bd16500c 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedAdapter.kt @@ -8,11 +8,11 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab class RecentlyClosedAdapter( private val interactor: RecentlyClosedFragmentInteractor -) : ListAdapter(DiffCallback) { +) : ListAdapter(DiffCallback) { override fun onCreateViewHolder( parent: ViewGroup, viewType: Int @@ -26,11 +26,11 @@ class RecentlyClosedAdapter( holder.bind(getItem(position)) } - private object DiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: ClosedTab, newItem: ClosedTab) = + private object DiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: RecoverableTab, newItem: RecoverableTab) = oldItem.id == newItem.id - override fun areContentsTheSame(oldItem: ClosedTab, newItem: ClosedTab) = + override fun areContentsTheSame(oldItem: RecoverableTab, newItem: RecoverableTab) = oldItem.id == newItem.id } } diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedController.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedController.kt index 0f71bf0233..d7676f80be 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedController.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedController.kt @@ -11,10 +11,10 @@ import androidx.navigation.NavController import androidx.navigation.NavOptions import mozilla.components.browser.session.SessionManager import mozilla.components.browser.state.action.RecentlyClosedAction -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.engine.prompt.ShareData -import mozilla.components.feature.recentlyclosed.ext.restoreTab +import mozilla.components.feature.tabs.TabsUseCases import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R @@ -22,29 +22,30 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.FenixSnackbar interface RecentlyClosedController { - fun handleOpen(item: ClosedTab, mode: BrowsingMode? = null) - fun handleDeleteOne(tab: ClosedTab) - fun handleCopyUrl(item: ClosedTab) - fun handleShare(item: ClosedTab) + fun handleOpen(item: RecoverableTab, mode: BrowsingMode? = null) + fun handleDeleteOne(tab: RecoverableTab) + fun handleCopyUrl(item: RecoverableTab) + fun handleShare(item: RecoverableTab) fun handleNavigateToHistory() - fun handleRestore(item: ClosedTab) + fun handleRestore(item: RecoverableTab) } class DefaultRecentlyClosedController( private val navController: NavController, private val store: BrowserStore, private val sessionManager: SessionManager, + private val tabsUseCases: TabsUseCases, private val resources: Resources, private val snackbar: FenixSnackbar, private val clipboardManager: ClipboardManager, private val activity: HomeActivity, - private val openToBrowser: (item: ClosedTab, mode: BrowsingMode?) -> Unit + private val openToBrowser: (item: RecoverableTab, mode: BrowsingMode?) -> Unit ) : RecentlyClosedController { - override fun handleOpen(item: ClosedTab, mode: BrowsingMode?) { + override fun handleOpen(item: RecoverableTab, mode: BrowsingMode?) { openToBrowser(item, mode) } - override fun handleDeleteOne(tab: ClosedTab) { + override fun handleDeleteOne(tab: RecoverableTab) { store.dispatch(RecentlyClosedAction.RemoveClosedTabAction(tab)) } @@ -55,7 +56,7 @@ class DefaultRecentlyClosedController( ) } - override fun handleCopyUrl(item: ClosedTab) { + override fun handleCopyUrl(item: RecoverableTab) { val urlClipData = ClipData.newPlainText(item.url, item.url) clipboardManager.setPrimaryClip(urlClipData) with(snackbar) { @@ -64,7 +65,7 @@ class DefaultRecentlyClosedController( } } - override fun handleShare(item: ClosedTab) { + override fun handleShare(item: RecoverableTab) { navController.navigate( RecentlyClosedFragmentDirections.actionGlobalShareFragment( data = arrayOf(ShareData(url = item.url, title = item.title)) @@ -72,15 +73,15 @@ class DefaultRecentlyClosedController( ) } - override fun handleRestore(item: ClosedTab) { - item.restoreTab( - store, - sessionManager, - onTabRestored = { - activity.openToBrowser( - from = BrowserDirection.FromRecentlyClosed - ) - } + override fun handleRestore(item: RecoverableTab) { + tabsUseCases.restore(item) + + store.dispatch( + RecentlyClosedAction.RemoveClosedTabAction(item) + ) + + activity.openToBrowser( + from = BrowserDirection.FromRecentlyClosed ) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt index 743e33c18d..aa1140f21c 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt @@ -18,7 +18,7 @@ import kotlinx.android.synthetic.main.fragment_recently_closed_tabs.view.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.map -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.lib.state.ext.flowScoped import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged @@ -34,7 +34,7 @@ import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.library.LibraryPageFragment @Suppress("TooManyFunctions") -class RecentlyClosedFragment : LibraryPageFragment() { +class RecentlyClosedFragment : LibraryPageFragment() { private lateinit var recentlyClosedFragmentStore: RecentlyClosedFragmentStore private var _recentlyClosedFragmentView: RecentlyClosedFragmentView? = null protected val recentlyClosedFragmentView: RecentlyClosedFragmentView @@ -82,6 +82,7 @@ class RecentlyClosedFragment : LibraryPageFragment() { navController = findNavController(), store = requireComponents.core.store, activity = activity as HomeActivity, + tabsUseCases = requireComponents.useCases.tabsUseCases, sessionManager = requireComponents.core.sessionManager, resources = requireContext().resources, snackbar = FenixSnackbar.make( @@ -104,7 +105,7 @@ class RecentlyClosedFragment : LibraryPageFragment() { _recentlyClosedFragmentView = null } - private fun openItem(tab: ClosedTab, mode: BrowsingMode? = null) { + private fun openItem(tab: RecoverableTab, mode: BrowsingMode? = null) { mode?.let { (activity as HomeActivity).browsingModeManager.mode = it } (activity as HomeActivity).openToBrowserAndLoad( @@ -131,5 +132,5 @@ class RecentlyClosedFragment : LibraryPageFragment() { } } - override val selectedItems: Set = setOf() + override val selectedItems: Set = setOf() } diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractor.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractor.kt index b62b430b26..a4ffed2dc2 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractor.kt @@ -4,7 +4,7 @@ package org.mozilla.fenix.library.recentlyclosed -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import org.mozilla.fenix.browser.browsingmode.BrowsingMode /** @@ -14,27 +14,27 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode class RecentlyClosedFragmentInteractor( private val recentlyClosedController: RecentlyClosedController ) : RecentlyClosedInteractor { - override fun restore(item: ClosedTab) { + override fun restore(item: RecoverableTab) { recentlyClosedController.handleRestore(item) } - override fun onCopyPressed(item: ClosedTab) { + override fun onCopyPressed(item: RecoverableTab) { recentlyClosedController.handleCopyUrl(item) } - override fun onSharePressed(item: ClosedTab) { + override fun onSharePressed(item: RecoverableTab) { recentlyClosedController.handleShare(item) } - override fun onOpenInNormalTab(item: ClosedTab) { + override fun onOpenInNormalTab(item: RecoverableTab) { recentlyClosedController.handleOpen(item, BrowsingMode.Normal) } - override fun onOpenInPrivateTab(item: ClosedTab) { + override fun onOpenInPrivateTab(item: RecoverableTab) { recentlyClosedController.handleOpen(item, BrowsingMode.Private) } - override fun onDeleteOne(tab: ClosedTab) { + override fun onDeleteOne(tab: RecoverableTab) { recentlyClosedController.handleDeleteOne(tab) } diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentStore.kt index cb75dabcab..37b4d14c09 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentStore.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentStore.kt @@ -4,7 +4,7 @@ package org.mozilla.fenix.library.recentlyclosed -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import mozilla.components.lib.state.Action import mozilla.components.lib.state.State import mozilla.components.lib.state.Store @@ -23,14 +23,14 @@ class RecentlyClosedFragmentStore(initialState: RecentlyClosedFragmentState) : * `RecentlyClosedFragmentState` through the reducer. */ sealed class RecentlyClosedFragmentAction : Action { - data class Change(val list: List) : RecentlyClosedFragmentAction() + data class Change(val list: List) : RecentlyClosedFragmentAction() } /** * The state for the Recently Closed Screen * @property items List of recently closed tabs to display */ -data class RecentlyClosedFragmentState(val items: List = emptyList()) : State +data class RecentlyClosedFragmentState(val items: List = emptyList()) : State /** * The RecentlyClosedFragmentState Reducer. diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentView.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentView.kt index d6297c13bd..740e82fa00 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentView.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentView.kt @@ -12,7 +12,7 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.android.extensions.LayoutContainer import kotlinx.android.synthetic.main.component_recently_closed.* -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import org.mozilla.fenix.R interface RecentlyClosedInteractor { @@ -21,7 +21,7 @@ interface RecentlyClosedInteractor { * * @param item the tapped item to restore. */ - fun restore(item: ClosedTab) + fun restore(item: RecoverableTab) /** * Called when the view more history option is tapped. @@ -33,35 +33,35 @@ interface RecentlyClosedInteractor { * * @param item the recently closed tab item to copy the URL from */ - fun onCopyPressed(item: ClosedTab) + fun onCopyPressed(item: RecoverableTab) /** * Opens the share sheet for a recently closed tab item. * * @param item the recently closed tab item to share */ - fun onSharePressed(item: ClosedTab) + fun onSharePressed(item: RecoverableTab) /** * Opens a recently closed tab item in a new tab. * * @param item the recently closed tab item to open in a new tab */ - fun onOpenInNormalTab(item: ClosedTab) + fun onOpenInNormalTab(item: RecoverableTab) /** * Opens a recently closed tab item in a private tab. * * @param item the recently closed tab item to open in a private tab */ - fun onOpenInPrivateTab(item: ClosedTab) + fun onOpenInPrivateTab(item: RecoverableTab) /** * Deletes one recently closed tab item. * - * @param item the recently closed tab item to delete. + * @param tab the recently closed tab item to delete. */ - fun onDeleteOne(tab: ClosedTab) + fun onDeleteOne(tab: RecoverableTab) } /** @@ -102,7 +102,7 @@ class RecentlyClosedFragmentView( } } - fun update(items: List) { + fun update(items: List) { recently_closed_empty_view.isVisible = items.isEmpty() recently_closed_list.isVisible = items.isNotEmpty() recentlyClosedAdapter.submitList(items) diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt index e60cc34eab..7d8e1f3466 100644 --- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt @@ -7,7 +7,7 @@ package org.mozilla.fenix.library.recentlyclosed import android.view.View import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.history_list_item.view.* -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import org.mozilla.fenix.R import org.mozilla.fenix.library.history.HistoryItemMenu import org.mozilla.fenix.utils.Do @@ -17,14 +17,14 @@ class RecentlyClosedItemViewHolder( private val recentlyClosedFragmentInteractor: RecentlyClosedFragmentInteractor ) : RecyclerView.ViewHolder(view) { - private var item: ClosedTab? = null + private var item: RecoverableTab? = null init { setupMenu() } fun bind( - item: ClosedTab + item: RecoverableTab ) { itemView.history_layout.titleView.text = if (item.title.isNotEmpty()) item.title else item.url diff --git a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt index 1d2a767a15..f935731b93 100644 --- a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt @@ -13,18 +13,16 @@ import io.mockk.Runs import io.mockk.every import io.mockk.just import io.mockk.mockk -import io.mockk.mockkStatic import io.mockk.slot -import io.mockk.unmockkStatic import io.mockk.verify import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestCoroutineDispatcher import mozilla.components.browser.session.SessionManager import mozilla.components.browser.state.action.RecentlyClosedAction -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.engine.prompt.ShareData -import mozilla.components.feature.recentlyclosed.ext.restoreTab +import mozilla.components.feature.tabs.TabsUseCases import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before @@ -47,16 +45,18 @@ class DefaultRecentlyClosedControllerTest { private val resources: Resources = mockk(relaxed = true) private val snackbar: FenixSnackbar = mockk(relaxed = true) private val clipboardManager: ClipboardManager = mockk(relaxed = true) - private val openToBrowser: (ClosedTab, BrowsingMode?) -> Unit = mockk(relaxed = true) + private val openToBrowser: (RecoverableTab, BrowsingMode?) -> Unit = mockk(relaxed = true) private val sessionManager: SessionManager = mockk(relaxed = true) private val activity: HomeActivity = mockk(relaxed = true) private val store: BrowserStore = mockk(relaxed = true) - val mockedTab: ClosedTab = mockk(relaxed = true) + private val tabsUseCases: TabsUseCases = mockk(relaxed = true) + val mockedTab: RecoverableTab = mockk(relaxed = true) private val controller = DefaultRecentlyClosedController( navController, store, sessionManager, + tabsUseCases, resources, snackbar, clipboardManager, @@ -66,19 +66,17 @@ class DefaultRecentlyClosedControllerTest { @Before fun setUp() { - mockkStatic("mozilla.components.feature.recentlyclosed.ext.ClosedTabKt") - every { mockedTab.restoreTab(any(), any(), any()) } just Runs + every { tabsUseCases.restore.invoke(any(), true) } just Runs } @After fun tearDown() { dispatcher.cleanupTestCoroutines() - unmockkStatic("mozilla.components.feature.recentlyclosed.ext.ClosedTabKt") } @Test fun handleOpen() { - val item: ClosedTab = mockk(relaxed = true) + val item: RecoverableTab = mockk(relaxed = true) controller.handleOpen(item, BrowsingMode.Private) @@ -95,7 +93,7 @@ class DefaultRecentlyClosedControllerTest { @Test fun handleDeleteOne() { - val item: ClosedTab = mockk(relaxed = true) + val item: RecoverableTab = mockk(relaxed = true) controller.handleDeleteOne(item) @@ -120,7 +118,7 @@ class DefaultRecentlyClosedControllerTest { @Test fun handleCopyUrl() { - val item = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val item = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) val clipdata = slot() @@ -139,7 +137,7 @@ class DefaultRecentlyClosedControllerTest { @Test @Suppress("UNCHECKED_CAST") fun handleShare() { - val item = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val item = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) controller.handleShare(item) @@ -160,12 +158,6 @@ class DefaultRecentlyClosedControllerTest { dispatcher.advanceUntilIdle() - verify { - mockedTab.restoreTab( - store, - sessionManager, - onTabRestored = any() - ) - } + verify { tabsUseCases.restore.invoke(mockedTab, true) } } } diff --git a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractorTest.kt index c4242bc03e..934ce58eaa 100644 --- a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragmentInteractorTest.kt @@ -6,7 +6,7 @@ package org.mozilla.fenix.library.recentlyclosed import io.mockk.mockk import io.mockk.verify -import mozilla.components.browser.state.state.ClosedTab +import mozilla.components.browser.state.state.recover.RecoverableTab import org.junit.Before import org.junit.Test import org.mozilla.fenix.browser.browsingmode.BrowsingMode @@ -27,7 +27,7 @@ class RecentlyClosedFragmentInteractorTest { @Test fun open() { - val tab = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val tab = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) interactor.restore(tab) verify { @@ -37,7 +37,7 @@ class RecentlyClosedFragmentInteractorTest { @Test fun onCopyPressed() { - val tab = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val tab = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) interactor.onCopyPressed(tab) verify { @@ -47,7 +47,7 @@ class RecentlyClosedFragmentInteractorTest { @Test fun onSharePressed() { - val tab = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val tab = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) interactor.onSharePressed(tab) verify { @@ -57,7 +57,7 @@ class RecentlyClosedFragmentInteractorTest { @Test fun onOpenInNormalTab() { - val tab = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val tab = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) interactor.onOpenInNormalTab(tab) verify { @@ -67,7 +67,7 @@ class RecentlyClosedFragmentInteractorTest { @Test fun onOpenInPrivateTab() { - val tab = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val tab = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) interactor.onOpenInPrivateTab(tab) verify { @@ -77,7 +77,7 @@ class RecentlyClosedFragmentInteractorTest { @Test fun onDeleteOne() { - val tab = ClosedTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", createdAt = 1L) + val tab = RecoverableTab(id = "tab-id", title = "Mozilla", url = "mozilla.org", lastAccess = 1L) interactor.onDeleteOne(tab) verify { diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index 6b32498bc2..d0c6cbf2ae 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -3,5 +3,5 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ object AndroidComponents { - const val VERSION = "71.0.20210110143120" + const val VERSION = "71.0.20210111162202" }