Fix launching NavDeepLink Intent

rocka · rocka · commit fe04b1a56d24 · 2024-01-04T13:02:43.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/utils/AppUtil.kt b/app/src/main/java/org/fcitx/fcitx5/android/utils/AppUtil.kt
@@ -21,8 +21,7 @@ object AppUtil {
     fun launchMain(context: Context) {
         context.startActivity(
             Intent(context, MainActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
             }
         )
     }
@@ -32,11 +31,16 @@ object AppUtil {
             .setComponentName(MainActivity::class.java)
             .setGraph(R.navigation.settings_nav)
             .addDestination(dest, arguments)
-            .createPendingIntent()
-            .send(context, 0, Intent().apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
-            })
+            .createTaskStackBuilder()
+            /**
+             * [androidx.core.app.TaskStackBuilder.getIntents] would add unwanted flags
+             * [Intent.FLAG_ACTIVITY_CLEAR_TASK] and [Intent.FLAG_ACTIVITY_TASK_ON_HOME]
+             * so we must launch the Intent by ourselves
+             */
+            .editIntentAt(0)?.apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+                context.startActivity(this)
+            }
     }
 
     fun launchMainToKeyboard(context: Context) =
