From 4610ff9185e44ddeeedef88fa4c4ea980900dc50 Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Wed, 25 Jan 2023 12:24:45 +0000
Subject: [PATCH 1/2] Start widgets in a separate task

So that closing the app does not end a PTT call
---
 vector/src/main/AndroidManifest.xml                             | 2 ++
 .../main/java/im/vector/app/features/widgets/WidgetActivity.kt  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 0244a9d8786..4459d5df350 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -284,6 +284,8 @@
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity
             android:name=".features.widgets.WidgetActivity"
+            android:launchMode="singleTask"
+            android:taskAffinity=".features.widgets.WidgetActivity.${appTaskAffinitySuffix}"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:supportsPictureInPicture="true" />
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
index 1af3b7162ce..b3784359c8a 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
@@ -63,6 +63,7 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>() {
         fun newIntent(context: Context, args: WidgetArgs): Intent {
             return Intent(context, WidgetActivity::class.java).apply {
                 putExtra(Mavericks.KEY_ARG, args)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
         }
 

From 0c29468eb1f55a58b374bf865bfee2e9d4caf05c Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Wed, 25 Jan 2023 13:28:06 +0000
Subject: [PATCH 2/2] Limit new task behaviour to Element Call widget

---
 vector/src/main/AndroidManifest.xml                           | 1 -
 .../java/im/vector/app/features/widgets/WidgetActivity.kt     | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 4459d5df350..496dc69dd21 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -284,7 +284,6 @@
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity
             android:name=".features.widgets.WidgetActivity"
-            android:launchMode="singleTask"
             android:taskAffinity=".features.widgets.WidgetActivity.${appTaskAffinitySuffix}"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:supportsPictureInPicture="true" />
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
index b3784359c8a..ce745992c5d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
@@ -63,7 +63,9 @@ class WidgetActivity : VectorBaseActivity<ActivityWidgetBinding>() {
         fun newIntent(context: Context, args: WidgetArgs): Intent {
             return Intent(context, WidgetActivity::class.java).apply {
                 putExtra(Mavericks.KEY_ARG, args)
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                if (args.kind == WidgetKind.ELEMENT_CALL) {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                }
             }
         }