From a8526a060625b49573989cd597e11e1c0588b37c Mon Sep 17 00:00:00 2001 From: Yeon Taek Jeong Date: Mon, 5 Aug 2019 14:53:13 -0700 Subject: [PATCH] For #4438: Fix crash when opening any URL from URL bar w/ long press --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 1 + app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 400db2995..dd159c51c 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -133,6 +133,7 @@ open class HomeActivity : AppCompatActivity(), ShareFragment.TabsSharedCallback override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) + navHost.navController.popBackStack(R.id.homeFragment, false) handleCrashIfNecessary(intent) handleOpenedFromExternalSourceIfNecessary(intent) } diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt index e034cd12d..178a49b54 100644 --- a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt @@ -80,7 +80,7 @@ class IntentReceiverActivity : Activity() { } else { if (!intent.getBooleanExtra(NotificationManager.RECEIVE_TABS_TAG, false)) { intent.flags = - Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP } true }