.

app/src/main/java/com/example/modifier/service/ModifierService.kt

@@ -339,7 +339,7 @@ class ModifierService : AccessibilityService() {
 
         binding.btnReq.setOnClickListener {
             CoroutineScope(Dispatchers.IO).launch {
-                taskRunner.requestNumberOnTask(reset = false, noBackup = true)
+                taskRunner.requestNumberOnTask(reset = true, noBackup = true)
             }
         }
 

app/src/main/java/com/example/modifier/service/TaskRunner.kt

@@ -344,7 +344,9 @@ class TaskRunner(
                     delay(100)
                     appStateRepo.updateRuntimeFlags(reqState = ReqState.RESET)
                     gmsgStateRepo.updateRcsState(RcsConfigureState.NOT_CONFIGURED)
-                    spoofedInfoRepo.mock()
+                    if (mock) {
+                        spoofedInfoRepo.mock()
+                    }
                     resetAll()
                     var switchAppear = gmsgStateRepo.waitForRcsState(
                         arrayOf(RcsConfigureState.WAITING_FOR_DEFAULT_ON),
@@ -467,7 +469,7 @@ class TaskRunner(
             sendOtpTimeout = 2.minutes
         }
         if (reset) {
-            reset()
+            reset(mock = false)
         }
         if (gmsgStateRepo.waitForRcsState(
                 arrayOf(RcsConfigureState.WAITING_FOR_OTP),
@@ -577,12 +579,11 @@ class TaskRunner(
                     }
 
                     needRest = needRest || appStateRepo.appState.value.requestedNum >= 5
-                    if (needRest && !appPrefsRepo.appPrefs.value.preventReset) {
-                        needRest = false
-                    }
-
+                            || spoofedInfoRepo.spoofedInfo.value.available
+                    needRest = needRest && !appPrefsRepo.appPrefs.value.preventReset
                     appStateRepo.incrementRequestedNum()
                     requestNumberAtomic(reset = needRest)
+                    needRest = false
                     return@withTimeoutOrNull true
                 } catch (e: Exception) {
                     if (e is RequestNumberException) {