From 4f7ad1fb7d55654181690c65e8c380c1fa6dd64d Mon Sep 17 00:00:00 2001
From: Miuzarte <982809597@qq.com>
Date: Wed, 15 Apr 2026 18:41:06 +0800
Subject: [PATCH] fix: make recent tasks usable while streaming

---
 app/build.gradle.kts                          |  4 ++--
 .../scrcpyforandroid/pages/DeviceTabScreen.kt | 22 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index af66105..2c33d2f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -54,8 +54,8 @@ android {
         applicationId = "io.github.miuzarte.scrcpyforandroid"
         minSdk = 26
         targetSdk = 37
-        versionCode = 13
-        versionName = "0.1.7"
+        versionCode = 14
+        versionName = "0.1.8"
 
         externalNativeBuild {
             cmake {
diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt
index 4dfb85b..f9290d5 100644
--- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt
+++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt
@@ -680,9 +680,8 @@ fun DeviceTabPage(
             resolveStartAppRequest(scrcpy, resolvedOptions)
         }.getOrElse { error ->
             logEvent(
-                "启动应用请求无效: ${
-                    error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName
-                }",
+                "启动应用请求无效: " +
+                        "${error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName}",
                 Log.WARN,
                 error,
             )
@@ -704,14 +703,15 @@ fun DeviceTabPage(
             }.onSuccess {
                 val appLabelPart = request.matchedAppLabel?.let { " ($it)" }.orEmpty()
                 logEvent(
-                    "已启动应用: ${request.packageName}$appLabelPart" +
-                            request.displayId?.let { " @display=$it" }.orEmpty()
+                    "已启动应用: " +
+                            "${request.packageName}$appLabelPart"
+                            + request.displayId?.let { " @display=$it" }.orEmpty()
                 )
             }.onFailure { error ->
                 logEvent(
-                    "启动应用失败: ${request.packageName} (${
-                        error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName
-                    })",
+                    "启动应用失败: " +
+                            "${request.packageName} " +
+                            "(${error.message?.takeIf { it.isNotBlank() } ?: error.javaClass.simpleName})",
                     Log.WARN,
                     error,
                 )
@@ -1222,9 +1222,13 @@ fun DeviceTabPage(
         },
         onLaunchTask = { task ->
             showRecentTasksSheet = false
-            runBusy("启动 scrcpy") {
+            if (sessionInfo == null) runBusy("启动 scrcpy") {
                 startScrcpySession(startAppOverride = task.packageName)
             }
+            else runBusy("启动应用") {
+                adbCoordinator.startApp(packageName = task.packageName)
+                logEvent("已启动应用: ${task.packageName}")
+            }
         },
     )
 }