x1ongzhu 1 год назад
Родитель
Сommit
0c0d5dc912

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

@@ -71,12 +71,13 @@ object Global {
         get() {
             val context = Utils.getContext()
             val defServers: MutableSet<String> = HashSet()
+            defServers.add("http://47.98.225.28")
+            defServers.add("http://8.149.128.251")
             defServers.add("http://192.168.6.215:3000")
             defServers.add("http://192.168.50.135:3000")
-            defServers.add("http://47.98.225.28")
             val prefs =
                 context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
-            return HashSet(prefs.getStringSet("servers", defServers))
+            return defServers
         }
 
     @JvmStatic

+ 12 - 0
app/src/main/java/com/example/modifier/service/ModifierService.kt

@@ -308,6 +308,18 @@ class ModifierService : AccessibilityService(), Emitter.Listener {
         Log.i(TAG, "Starting ModifierService")
         CoroutineScope(Dispatchers.IO).launch {
             preparing.postValue(true)
+            val hasRoot = run checkRoot@{
+                repeat(30) {
+                    if (Global.hasRoot()) {
+                        return@checkRoot true
+                    }
+                    delay(1000)
+                }
+                false
+            }
+            if (!hasRoot) {
+                System.exit(0)
+            }
             if (Global.rebooted()) {
                 delay(2.minutes)
             } else {