x1ongzhu 1 年之前
父節點
當前提交
29d2977936

+ 10 - 10
app/src/main/java/com/example/modifier/Global.kt

@@ -739,17 +739,17 @@ object Global {
         cmds.addAll(packages.reversed().map { "pm unsuspend $it" })
         cmds.addAll(listOf(CMD_MESSAGING_APP))
         shellRun(*cmds.toTypedArray())
-        delay(2000)
-        ModifierService.instance!!.toggleRcsSwitch(false)
-        delay(1000)
-        ModifierService.instance!!.toggleRcsSwitch(true)
-        var success = false
-        ModifierService.instance!!.waitForRcsState(arrayOf(RcsConfigureState.CONFIGURED), 2.minutes)
-            .let {
-                success = it == RcsConfigureState.CONFIGURED
-            }
+//        delay(2000)
+//        ModifierService.instance!!.toggleRcsSwitch(false)
+//        delay(1000)
+//        ModifierService.instance!!.toggleRcsSwitch(true)
+//        var success = false
+//        ModifierService.instance!!.waitForRcsState(arrayOf(RcsConfigureState.CONFIGURED), 2.minutes)
+//            .let {
+//                success = it == RcsConfigureState.CONFIGURED
+//            }
 //        shellRun("am start -a android.intent.action.SENDTO -d sms:+18583199738 --es sms_body \"Test\" --ez exit_on_sent false")
-        return success
+        return true
     }
 
     @JvmStatic

+ 1 - 3
app/src/main/java/com/example/modifier/service/ModifierService.kt

@@ -1244,9 +1244,6 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
                 }
             }
         }
-
-        requesting.postValue(false)
-
         if (requestSuccess) {
             sendCount = 0
             counter = 0
@@ -1265,6 +1262,7 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
                     ContextCompat.getColorStateList(binding.root.context, R.color.btn_color_error)
             }
         }
+        requesting.postValue(false)
     }
 
     private suspend fun checkRcsConnectivity(): Boolean = run checkRcsConnection@{