From 21b6e413cc7152634f62f86d817f6a4bf489c32b Mon Sep 17 00:00:00 2001
From: SuperMonster003 <wu2du2mo2gu0@gmail.com>
Date: Wed, 23 Jul 2025 14:51:04 +0800
Subject: [PATCH] =?UTF-8?q?6.7.0=20-=20Alpha3=20-=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=99=A8=E5=9B=BE=E6=A0=87=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  8 ++++
 .../ui/settings/LauncherIconPreference.kt     | 43 ++++++++++---------
 version.properties                            |  6 +--
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ac68dc4..45252b37 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -231,6 +231,10 @@
 
             </intent-filter>
 
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/app_shortcuts" />
+
         </activity-alias>
 
         <activity-alias
@@ -248,6 +252,10 @@
 
             </intent-filter>
 
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/app_shortcuts" />
+
         </activity-alias>
 
         <activity
diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt b/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt
index 401c1f47..e1f4fe32 100644
--- a/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt
@@ -160,29 +160,32 @@ class LauncherIconPreference : MaterialListPreference, SharedPreferences.OnShare
         )
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
             ctx.getSystemService(ShortcutManager::class.java)?.let { sm ->
-                sm.pinnedShortcuts.mapNotNull { shortcutInfo ->
-                    ShortcutInfo.Builder(ctx, shortcutInfo.id).apply {
-                        shortcutInfo.intent?.let {
-                            it.component?.let { component ->
-                                setActivity(ComponentName(component.packageName, component.className))
+                sm.pinnedShortcuts
+                    .filterNot { it.isDeclaredInManifest }
+                    .filterNot { Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && it.isImmutable }
+                    .mapNotNull { shortcutInfo ->
+                        ShortcutInfo.Builder(ctx, shortcutInfo.id).apply {
+                            shortcutInfo.intent?.let {
+                                it.component?.let { component ->
+                                    setActivity(ComponentName(component.packageName, component.className))
+                                } ?: run {
+                                    setActivity(ComponentName(ctx, ShortcutActivity::class.java))
+                                }
+                                setIntent(it)
                             } ?: run {
                                 setActivity(ComponentName(ctx, ShortcutActivity::class.java))
+                                setIntent(Intent(ctx, ShortcutActivity::class.java))
                             }
-                            setIntent(it)
-                        } ?: run {
-                            setActivity(ComponentName(ctx, ShortcutActivity::class.java))
-                            setIntent(Intent(ctx, ShortcutActivity::class.java))
-                        }
-                        (shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let {
-                            setShortLabel(it)
-                        }
-                        (shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let {
-                            setLongLabel(it)
-                        }
-                    }.build()
-                }.takeUnless { it.isEmpty() }?.let { toUpdate ->
-                    sm.updateShortcuts(toUpdate)
-                }
+                            (shortcutInfo.shortLabel ?: shortcutInfo.longLabel)?.let {
+                                setShortLabel(it)
+                            }
+                            (shortcutInfo.longLabel ?: shortcutInfo.shortLabel)?.let {
+                                setLongLabel(it)
+                            }
+                        }.build()
+                    }.takeUnless { it.isEmpty() }?.let { toUpdate ->
+                        sm.updateShortcuts(toUpdate)
+                    }
             }
         }
 
diff --git a/version.properties b/version.properties
index 3644f7c1..97998922 100644
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
-#Mon Jul 21 18:22:17 CST 2025
-BUILD_TIME=1753093337104
+#Wed Jul 23 14:44:12 CST 2025
+BUILD_TIME=1753253052464
 COMPILE_SDK_VERSION=35
 IMAGE_QUANT_CMAKE_VERSION=3.22.1
 IMAGE_QUANT_NDK_VERSION=26.1.10909125
@@ -19,6 +19,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
 TARGET_SDK_VERSION=35
 TARGET_SDK_VERSION_INRT=29
-VERSION_BUILD=3336
+VERSION_BUILD=3337
 VERSION_NAME=6.7.0 Alpha3
 VSCODE_EXT_REQUIRED_VERSION=1.0.8