fix: Pin shortcut ANR

Signed-off-by: Hu Shenghao <[email protected]>
hushenghao · Jan 10, 2025 · 36849ab · 36849ab
1 parent 3e0b5a9
commit 36849ab
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - EdgeToEdge mode is enabled on the Easter Egg pages
 - Upgrade project dependencies
+- Known issue fixes
 
 ### v3.3.0 (2024-12-20)
 

diff --git a/CHANGELOG_zh.md b/CHANGELOG_zh.md
@@ -4,6 +4,7 @@
 
 - 彩蛋相关页面开启了 EdgeToEdge 模式
 - 升级项目依赖项
+- 修复已知问题
 
 ### v3.3.0 (2024-12-20)
 

diff --git a/basic/consumer-rules.pro b/basic/consumer-rules.pro
@@ -6,4 +6,6 @@
 # EdgeToEdgeCompat
 -keep class androidx.activity.EdgeToEdgeImpl { *; }
 -keep class * extends androidx.activity.EdgeToEdgeImpl { *; }
--keep class com.google.android.material.internal.EdgeToEdgeUtils { *; }
+-keep class com.google.android.material.internal.EdgeToEdgeUtils {
+    public static <methods>;
+}
diff --git a/core/shortcut/src/main/java/com/dede/android_eggs/views/main/util/EasterEggShortcutsHelp.kt b/core/shortcut/src/main/java/com/dede/android_eggs/views/main/util/EasterEggShortcutsHelp.kt
@@ -132,12 +132,16 @@ object EasterEggShortcutsHelp {
         val shortcutId = FORMAT_PIN_SHORTCUT_ID.format(egg.apiLevel)
         val shortcut = createShortcutInfo(context, shortcutId, egg, true)
         val callback = PinShortcutReceiver.registerCallbackWithTimeout(context)
-        ShortcutManagerCompat.requestPinShortcut(context, shortcut, callback)
+        cachedExecutor.execute {
+            ShortcutManagerCompat.requestPinShortcut(context, shortcut, callback)
+        }
     }
 
     fun autoReportShortcutUsed(context: Context, intent: Intent) {
         val shortcutId = intent.getStringExtra(EXTRA_SHORTCUT_ID) ?: return
-        ShortcutManagerCompat.reportShortcutUsed(context, shortcutId)
+        cachedExecutor.execute {
+            ShortcutManagerCompat.reportShortcutUsed(context, shortcutId)
+        }
     }
 
     private class PinShortcutReceiver : BroadcastReceiver() {

diff --git a/fastlane/metadata/android/en-US/changelogs/58.txt b/fastlane/metadata/android/en-US/changelogs/58.txt
@@ -1,2 +1,3 @@
 - EdgeToEdge mode is enabled on the Easter Egg pages
-- Upgrade project dependencies
+- Upgrade project dependencies
+- Known issue fixes
diff --git a/fastlane/metadata/android/zh-CN/changelogs/58.txt b/fastlane/metadata/android/zh-CN/changelogs/58.txt
@@ -1,2 +1,3 @@
 - 彩蛋相关页面开启了 EdgeToEdge 模式
-- 升级项目依赖项
+- 升级项目依赖项
+- 修复已知问题