Issue #14225: Remove task when finishing ExternalAppBrowserActivity.

pull/128/head^2
Sebastian Kaspari 4 years ago
parent f036d3db67
commit ee3384ac52

@ -89,7 +89,7 @@ class CustomTabsIntegration(
menuItemIndex = START_OF_MENU_ITEMS_INDEX, menuItemIndex = START_OF_MENU_ITEMS_INDEX,
window = activity.window, window = activity.window,
shareListener = { onItemTapped.invoke(ToolbarMenu.Item.Share) }, shareListener = { onItemTapped.invoke(ToolbarMenu.Item.Share) },
closeListener = { activity.finish() } closeListener = { activity.finishAndRemoveTask() }
) )
override fun start() = feature.start() override fun start() = feature.start()

@ -44,7 +44,7 @@ open class ExternalAppBrowserActivity : HomeActivity() {
customTabSessionId: String? customTabSessionId: String?
): NavDirections? { ): NavDirections? {
if (customTabSessionId == null) { if (customTabSessionId == null) {
finish() finishAndRemoveTask()
return null return null
} }

@ -58,10 +58,10 @@ class ExternalAppBrowserActivityTest {
var directions = activity.getNavDirections(BrowserDirection.FromGlobal, "id") var directions = activity.getNavDirections(BrowserDirection.FromGlobal, "id")
assertNotNull(directions) assertNotNull(directions)
verify(exactly = 0) { activity.finish() } verify(exactly = 0) { activity.finishAndRemoveTask() }
directions = activity.getNavDirections(BrowserDirection.FromGlobal, null) directions = activity.getNavDirections(BrowserDirection.FromGlobal, null)
assertNull(directions) assertNull(directions)
verify { activity.finish() } verify { activity.finishAndRemoveTask() }
} }
} }

Loading…
Cancel
Save