153

app/build.gradle

@@ -24,7 +24,7 @@ android {
         applicationId "com.example.modifier"
         minSdk 29
         targetSdk 34
-        versionCode 152
+        versionCode 153
         versionName "1.0.1"
         archivesBaseName = "modifier-${versionCode}"
 

app/src/main/java/com/example/modifier/repo/AppStateRepo.kt

@@ -81,6 +81,14 @@ class AppStateRepo private constructor(private val context: Context) {
         }
     }
 
+    suspend fun setRequestedNum(num: Int) {
+        context.appStateDataStore.edit { preferences ->
+            val requestedNum = (preferences[PreferencesKeys.REQUESTED_NUM] ?: 0) + 1
+            Log.i(TAG, "incrementRequestedNum: $requestedNum")
+            preferences[PreferencesKeys.REQUESTED_NUM] = requestedNum
+        }
+    }
+
     suspend fun resetExecutedNum() {
         context.appStateDataStore.edit { preferences ->
             preferences[PreferencesKeys.EXECUTED_NUM] = 0

app/src/main/java/com/example/modifier/repo/BackupRepository.kt

@@ -173,33 +173,33 @@ class BackupRepository(
             "sleep 1",
             PACKAGE_GMS.kill(),
             "settings put secure location_mode 0",
-//            "pm revoke com.google.android.gms android.permission.GET_ACCOUNTS",
-//            "pm revoke com.google.android.gms android.permission.SYSTEM_ALERT_WINDOW",
-//            "pm revoke com.google.android.gms android.permission.POST_NOTIFICATIONS",
-//            "pm revoke com.google.android.gms android.permission.READ_CONTACTS",
-//            "pm revoke com.google.android.gms android.permission.CAMERA",
-//            "pm revoke com.google.android.gms android.permission.RECEIVE_MMS",
-//            "pm revoke com.google.android.gms android.permission.GET_APP_OPS_STATS",
-//            "pm revoke com.google.android.gms android.permission.PROCESS_OUTGOING_CALLS",
-//            "pm revoke com.google.android.gms android.permission.BLUETOOTH_CONNECT",
-//            "pm revoke com.google.android.gms android.permission.BLUETOOTH_SCAN",
-//            "pm revoke com.google.android.gms android.permission.BLUETOOTH_ADVERTISE",
-//            "pm revoke com.google.android.gms android.permission.NEARBY_WIFI_DEVICES",
-//            "pm revoke com.google.android.gms android.permission.UWB_RANGING",
-//            "pm revoke com.google.android.gms android.permission.READ_CALL_LOG",
-//            "pm revoke com.google.android.gms android.permission.WRITE_CONTACTS",
-//            "pm revoke com.google.android.gms android.permission.CALL_PHONE",
-//            "pm revoke com.google.android.gms android.permission.RECORD_AUDIO",
-//            "pm revoke com.google.android.gms android.permission.READ_LOGS",
-//            "pm revoke com.google.android.gms android.permission.READ_MEDIA_AUDIO",
-//            "pm revoke com.google.android.gms android.permission.READ_MEDIA_IMAGES",
-//            "pm revoke com.google.android.gms android.permission.READ_MEDIA_VIDEO",
-//            "pm revoke com.google.android.gms android.permission.ACCESS_MEDIA_LOCATION",
-//            "pm revoke com.google.android.gms android.permission.ACCESS_BROADCAST_RESPONSE_STATS",
-//            "pm revoke com.google.android.gms android.permission.WRITE_CALL_LOG",
-//            "pm revoke com.google.android.gms android.permission.BODY_SENSORS",
-//            "pm revoke com.google.android.gms android.permission.DUMP",
-//            "sleep 30",
+            "pm revoke com.google.android.gms android.permission.GET_ACCOUNTS",
+            "pm revoke com.google.android.gms android.permission.SYSTEM_ALERT_WINDOW",
+            "pm revoke com.google.android.gms android.permission.POST_NOTIFICATIONS",
+            "pm revoke com.google.android.gms android.permission.READ_CONTACTS",
+            "pm revoke com.google.android.gms android.permission.CAMERA",
+            "pm revoke com.google.android.gms android.permission.RECEIVE_MMS",
+            "pm revoke com.google.android.gms android.permission.GET_APP_OPS_STATS",
+            "pm revoke com.google.android.gms android.permission.PROCESS_OUTGOING_CALLS",
+            "pm revoke com.google.android.gms android.permission.BLUETOOTH_CONNECT",
+            "pm revoke com.google.android.gms android.permission.BLUETOOTH_SCAN",
+            "pm revoke com.google.android.gms android.permission.BLUETOOTH_ADVERTISE",
+            "pm revoke com.google.android.gms android.permission.NEARBY_WIFI_DEVICES",
+            "pm revoke com.google.android.gms android.permission.UWB_RANGING",
+            "pm revoke com.google.android.gms android.permission.READ_CALL_LOG",
+            "pm revoke com.google.android.gms android.permission.WRITE_CONTACTS",
+            "pm revoke com.google.android.gms android.permission.CALL_PHONE",
+            "pm revoke com.google.android.gms android.permission.RECORD_AUDIO",
+            "pm revoke com.google.android.gms android.permission.READ_LOGS",
+            "pm revoke com.google.android.gms android.permission.READ_MEDIA_AUDIO",
+            "pm revoke com.google.android.gms android.permission.READ_MEDIA_IMAGES",
+            "pm revoke com.google.android.gms android.permission.READ_MEDIA_VIDEO",
+            "pm revoke com.google.android.gms android.permission.ACCESS_MEDIA_LOCATION",
+            "pm revoke com.google.android.gms android.permission.ACCESS_BROADCAST_RESPONSE_STATS",
+            "pm revoke com.google.android.gms android.permission.WRITE_CALL_LOG",
+            "pm revoke com.google.android.gms android.permission.BODY_SENSORS",
+            "pm revoke com.google.android.gms android.permission.DUMP",
+            "sleep 30",
             PACKAGE_MESSAGING.enable(),
             "sleep 1",
             CMD_MESSAGING_APP,

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

@@ -532,7 +532,7 @@ class TaskRunner(
                         }
                     }
 
-                    needRest = needRest || appStateRepo.appState.value.requestedNum >= 0
+                    needRest = needRest || appStateRepo.appState.value.requestedNum >= 3
                     if (needRest && !appPrefsRepo.appPrefs.value.preventReset) {
                         reset()
                         needRest = false
@@ -567,6 +567,7 @@ class TaskRunner(
             reqState = ReqState.NONE,
             suspended = requestSuccess != true
         )
+        appStateRepo.incrementRequestedNum()
     }
 
     private suspend fun checkRcsConnectivity(): Boolean = run checkRcsConnection@{

app/src/main/java/com/example/modifier/utils/Package.kt

@@ -104,32 +104,32 @@ suspend fun resetAll() {
             PACKAGE_GMS.clear(),
             "sleep 2",
             "settings put secure location_mode 0",
-//            "pm revoke com.google.android.gms android.permission.GET_ACCOUNTS",
-//            "pm revoke com.google.android.gms android.permission.SYSTEM_ALERT_WINDOW",
-//            "pm revoke com.google.android.gms android.permission.POST_NOTIFICATIONS",
-//            "pm revoke com.google.android.gms android.permission.READ_CONTACTS",
-//            "pm revoke com.google.android.gms android.permission.CAMERA",
-//            "pm revoke com.google.android.gms android.permission.RECEIVE_MMS",
-//            "pm revoke com.google.android.gms android.permission.GET_APP_OPS_STATS",
-//            "pm revoke com.google.android.gms android.permission.PROCESS_OUTGOING_CALLS",
-//            "pm revoke com.google.android.gms android.permission.BLUETOOTH_CONNECT",
-//            "pm revoke com.google.android.gms android.permission.BLUETOOTH_SCAN",
-//            "pm revoke com.google.android.gms android.permission.BLUETOOTH_ADVERTISE",
-//            "pm revoke com.google.android.gms android.permission.NEARBY_WIFI_DEVICES",
-//            "pm revoke com.google.android.gms android.permission.UWB_RANGING",
-//            "pm revoke com.google.android.gms android.permission.READ_CALL_LOG",
-//            "pm revoke com.google.android.gms android.permission.WRITE_CONTACTS",
-//            "pm revoke com.google.android.gms android.permission.CALL_PHONE",
-//            "pm revoke com.google.android.gms android.permission.RECORD_AUDIO",
-//            "pm revoke com.google.android.gms android.permission.READ_LOGS",
-//            "pm revoke com.google.android.gms android.permission.READ_MEDIA_AUDIO",
-//            "pm revoke com.google.android.gms android.permission.READ_MEDIA_IMAGES",
-//            "pm revoke com.google.android.gms android.permission.READ_MEDIA_VIDEO",
-//            "pm revoke com.google.android.gms android.permission.ACCESS_MEDIA_LOCATION",
-//            "pm revoke com.google.android.gms android.permission.ACCESS_BROADCAST_RESPONSE_STATS",
-//            "pm revoke com.google.android.gms android.permission.WRITE_CALL_LOG",
-//            "pm revoke com.google.android.gms android.permission.BODY_SENSORS",
-//            "pm revoke com.google.android.gms android.permission.DUMP",
+            "pm revoke com.google.android.gms android.permission.GET_ACCOUNTS",
+            "pm revoke com.google.android.gms android.permission.SYSTEM_ALERT_WINDOW",
+            "pm revoke com.google.android.gms android.permission.POST_NOTIFICATIONS",
+            "pm revoke com.google.android.gms android.permission.READ_CONTACTS",
+            "pm revoke com.google.android.gms android.permission.CAMERA",
+            "pm revoke com.google.android.gms android.permission.RECEIVE_MMS",
+            "pm revoke com.google.android.gms android.permission.GET_APP_OPS_STATS",
+            "pm revoke com.google.android.gms android.permission.PROCESS_OUTGOING_CALLS",
+            "pm revoke com.google.android.gms android.permission.BLUETOOTH_CONNECT",
+            "pm revoke com.google.android.gms android.permission.BLUETOOTH_SCAN",
+            "pm revoke com.google.android.gms android.permission.BLUETOOTH_ADVERTISE",
+            "pm revoke com.google.android.gms android.permission.NEARBY_WIFI_DEVICES",
+            "pm revoke com.google.android.gms android.permission.UWB_RANGING",
+            "pm revoke com.google.android.gms android.permission.READ_CALL_LOG",
+            "pm revoke com.google.android.gms android.permission.WRITE_CONTACTS",
+            "pm revoke com.google.android.gms android.permission.CALL_PHONE",
+            "pm revoke com.google.android.gms android.permission.RECORD_AUDIO",
+            "pm revoke com.google.android.gms android.permission.READ_LOGS",
+            "pm revoke com.google.android.gms android.permission.READ_MEDIA_AUDIO",
+            "pm revoke com.google.android.gms android.permission.READ_MEDIA_IMAGES",
+            "pm revoke com.google.android.gms android.permission.READ_MEDIA_VIDEO",
+            "pm revoke com.google.android.gms android.permission.ACCESS_MEDIA_LOCATION",
+            "pm revoke com.google.android.gms android.permission.ACCESS_BROADCAST_RESPONSE_STATS",
+            "pm revoke com.google.android.gms android.permission.WRITE_CALL_LOG",
+            "pm revoke com.google.android.gms android.permission.BODY_SENSORS",
+            "pm revoke com.google.android.gms android.permission.DUMP",
             "sleep 2",
             PACKAGE_MESSAGING.kill(),
             PACKAGE_MESSAGING.resume(),