From f60df4a9761911e90b1fc7e1fc3774fb39d1e98b Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Mon, 2 Nov 2020 11:16:29 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/16268 - Allowing multiple task
 while sharing (https://github.com/mozilla-mobile/fenix/pull/16275)

---
 app/src/main/java/org/mozilla/fenix/share/ShareController.kt | 5 +++--
 .../test/java/org/mozilla/fenix/share/ShareControllerTest.kt | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/share/ShareController.kt b/app/src/main/java/org/mozilla/fenix/share/ShareController.kt
index e3c1a7310e..c5419e8c1e 100644
--- a/app/src/main/java/org/mozilla/fenix/share/ShareController.kt
+++ b/app/src/main/java/org/mozilla/fenix/share/ShareController.kt
@@ -10,7 +10,8 @@ import android.content.Intent
 import android.content.Intent.ACTION_SEND
 import android.content.Intent.EXTRA_SUBJECT
 import android.content.Intent.EXTRA_TEXT
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK
+import android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT
 import android.net.Uri
 import androidx.annotation.VisibleForTesting
 import androidx.navigation.NavController
@@ -95,7 +96,7 @@ class DefaultShareController(
             putExtra(EXTRA_TEXT, getShareText())
             putExtra(EXTRA_SUBJECT, getShareSubject())
             type = "text/plain"
-            flags = FLAG_ACTIVITY_NEW_TASK
+            flags = FLAG_ACTIVITY_NEW_DOCUMENT + FLAG_ACTIVITY_MULTIPLE_TASK
             setClassName(app.packageName, app.activityName)
         }
 
diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
index a0f9e833dc..2f20066742 100644
--- a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
@@ -115,7 +115,7 @@ class ShareControllerTest {
         assertEquals(shareSubject, shareIntent.captured.extras!![Intent.EXTRA_SUBJECT])
         assertEquals(textToShare, shareIntent.captured.extras!![Intent.EXTRA_TEXT])
         assertEquals("text/plain", shareIntent.captured.type)
-        assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK, shareIntent.captured.flags)
+        assertEquals(Intent.FLAG_ACTIVITY_NEW_DOCUMENT + Intent.FLAG_ACTIVITY_MULTIPLE_TASK, shareIntent.captured.flags)
         assertEquals(appPackageName, shareIntent.captured.component!!.packageName)
         assertEquals(appClassName, shareIntent.captured.component!!.className)