From 679db97209bb0d0092efd4f53dd898b38d83ffed Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 10 Apr 2019 18:05:19 -0400
Subject: [PATCH] Always run su requests in new tasks

---
 app/src/main/AndroidManifest.xml                      |  3 +--
 .../topjohnwu/magisk/components/GeneralReceiver.java  | 11 +++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db46be8fa..beb5505cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,10 +41,9 @@
 
         <activity
             android:name="a.m"
+            android:exported="false"
             android:directBootAware="true"
             android:excludeFromRecents="true"
-            android:launchMode="singleTask"
-            android:taskAffinity="a.m"
             android:theme="@style/SuRequest" />
 
         <!-- Receiver -->
diff --git a/app/src/main/java/com/topjohnwu/magisk/components/GeneralReceiver.java b/app/src/main/java/com/topjohnwu/magisk/components/GeneralReceiver.java
index 8d7523e18..9a1e7711f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/components/GeneralReceiver.java
+++ b/app/src/main/java/com/topjohnwu/magisk/components/GeneralReceiver.java
@@ -3,7 +3,6 @@ package com.topjohnwu.magisk.components;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.ClassMap;
@@ -15,7 +14,6 @@ import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.uicomponents.Notifications;
 import com.topjohnwu.magisk.uicomponents.Shortcuts;
 import com.topjohnwu.magisk.utils.DownloadApp;
-import com.topjohnwu.magisk.utils.RootUtils;
 import com.topjohnwu.magisk.utils.SuLogger;
 import com.topjohnwu.superuser.Shell;
 
@@ -51,12 +49,9 @@ public class GeneralReceiver extends BroadcastReceiver {
                     case "request":
                         Intent i = new Intent(app, ClassMap.get(SuRequestActivity.class))
                                 .putExtra("socket", intent.getStringExtra("socket"))
-                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        if (Build.VERSION.CODENAME.equals("Q")) {
-                            RootUtils.startActivity(i);
-                        } else {
-                            app.startActivity(i);
-                        }
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+                        app.startActivity(i);
                         break;
                     case "log":
                         SU_LOGGER.handleLogs(intent);