fix: timing sync crash above Android 12

We need explicitly specify the mutability of PendingIntent above Android 12 and it's better to use immutable flag (added in API level 23, M) as we just use the intent directly.
osfans · Oct 18, 2023 · 3501cc9 · 3501cc9
1 parent ac654e3
commit 3501cc9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/broadcast/IntentReceiver.kt b/app/src/main/java/com/osfans/trime/ime/broadcast/IntentReceiver.kt
@@ -72,7 +72,11 @@ class IntentReceiver : BroadcastReceiver(), CoroutineScope by MainScope() {
                     context,
                     0,
                     Intent("com.osfans.trime.timing.sync"),
-                    PendingIntent.FLAG_UPDATE_CURRENT,
+                    if (VERSION.SDK_INT >= VERSION_CODES.M) {
+                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                    },
                 )
                 if (VERSION.SDK_INT >= VERSION_CODES.M) { // 根据SDK设置alarm任务
                     alarmManager.setExactAndAllowWhileIdle(

diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java
@@ -339,7 +339,9 @@ public void restartSystemStartTimingSync() { // 防止重启系统 强行停止
               this,
               0,
               new Intent("com.osfans.trime.timing.sync"),
-              PendingIntent.FLAG_UPDATE_CURRENT);
+              VERSION.SDK_INT >= VERSION_CODES.M
+                  ? (PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE)
+                  : PendingIntent.FLAG_UPDATE_CURRENT);
       if (VERSION.SDK_INT >= VERSION_CODES.M) { // 根据SDK设置alarm任务
         alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);
       } else {

diff --git a/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt b/app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt
@@ -114,7 +114,11 @@ class ProfileFragment :
                     context,
                     0,
                     Intent("com.osfans.trime.timing.sync"),
-                    PendingIntent.FLAG_UPDATE_CURRENT,
+                    if (VERSION.SDK_INT >= VERSION_CODES.M) {
+                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        PendingIntent.FLAG_UPDATE_CURRENT
+                    },
                 )
                 val cal = Calendar.getInstance()
                 if (get<SwitchPreferenceCompat>("profile_timing_sync")?.isChecked == true) { // 当定时同步偏好打开时