From f952234c57be344b71da45beb1f5a8def957dc34 Mon Sep 17 00:00:00 2001
From: Yeon Taek Jeong <yeontaekj@gmail.com>
Date: Tue, 6 Aug 2019 13:44:47 -0700
Subject: [PATCH] Keep CLEAR_TASK

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt          | 5 +++++
 .../main/java/org/mozilla/fenix/IntentReceiverActivity.kt    | 2 +-
 2 files changed, 6 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..be59d5a6d 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -134,6 +134,11 @@ open class HomeActivity : AppCompatActivity(), ShareFragment.TabsSharedCallback
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         handleCrashIfNecessary(intent)
+        intent?.run {
+            if (this.flags and Intent.FLAG_ACTIVITY_CLEAR_TASK != 0) {
+                return
+            }
+        }
         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 178a49b54..e034cd12d 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_TOP
+                            Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
                     true
                 }