patially support global

qhy040404 · Apr 23, 2024 · 9a0755a · 9a0755a
1 parent 09b137a
commit 9a0755a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "com.qhy040404.fxxkmiuiad"
         minSdk = 29
         targetSdk = 34
-        versionCode = 6
-        versionName = "1.2.2"
+        versionCode = 7
+        versionName = "1.2.3"
     }
 
     buildFeatures {

diff --git a/app/src/main/java/com/qhy040404/fxxkmiuiad/Constants.kt b/app/src/main/java/com/qhy040404/fxxkmiuiad/Constants.kt
@@ -6,7 +6,11 @@ object Constants {
 
     const val MIUI_ROM = "com.miui.rom"
     val FUCKLIST = listOf(
+        // CN
         "com.miui.hybrid",
-        "com.miui.systemAdSolution"
+        "com.miui.systemAdSolution",
+
+        // GLOBAL
+        "com.miui.msa.global"
     )
 }
diff --git a/app/src/main/java/com/qhy040404/fxxkmiuiad/MainActivity.kt b/app/src/main/java/com/qhy040404/fxxkmiuiad/MainActivity.kt
@@ -34,6 +34,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         }
     }
 
+    private val packageList = Constants.FUCKLIST.filter {
+        packageManager.getPackageInfo(it, 0) != null
+    }
+
     override fun init() {
         Shizuku.addRequestPermissionResultListener(callback)
         initView()
@@ -83,7 +87,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
                 val states = mutableMapOf<String, String>()
 
-                Constants.FUCKLIST.forEach {
+                packageList.forEach {
                     states[it] = packageManager.getApplicationEnableStateAsString(it)
                 }
 
@@ -182,10 +186,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             runCatching { Shizuku.requestPermission(0) }
         }
         binding.enableBtn.setOnClickListener {
-            Constants.FUCKLIST.forEach {
+            packageList.forEach {
                 PackageUtils.setApplicationEnabledSetting(it, PackageManager.COMPONENT_ENABLED_STATE_ENABLED)
             }
-            if (Constants.FUCKLIST.any { packageManager.isPackageSuspended(it) }) {
+            if (packageList.any { packageManager.isPackageSuspended(it) }) {
                 thread {
                     Thread.sleep(200L)
                     runOnUiThread {
@@ -201,15 +205,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                             .setPositiveButton("关闭", null)
                             .setNeutralButton("复制 adb 指令") { _, _ ->
                                 buildString {
-                                    Constants.FUCKLIST.forEach {
+                                    packageList.forEach {
                                         append("adb shell pm unsuspend $it")
                                         appendLine()
                                     }
                                 }.copyToClipboard(this)
                             }
                             .setNegativeButton("复制 shell 指令") { _, _ ->
                                 buildString {
-                                    Constants.FUCKLIST.forEach {
+                                    packageList.forEach {
                                         append("pm unsuspend $it")
                                         appendLine()
                                     }
@@ -231,7 +235,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         }
         binding.disableBtn.setOnClickListener {
             runCatching {
-                Constants.FUCKLIST.forEach {
+                packageList.forEach {
                     PackageUtils.setApplicationEnabledSetting(it, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
                 }
             }.onSuccess {
@@ -256,15 +260,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                             .setPositiveButton("关闭", null)
                             .setNeutralButton("复制 adb 指令") {_ ,_ ->
                                 buildString {
-                                    Constants.FUCKLIST.forEach {
+                                    packageList.forEach {
                                         append("adb shell pm suspend $it")
                                         appendLine()
                                     }
                                 }.copyToClipboard(this)
                             }
                             .setNegativeButton("复制 shell 指令") {_,_->
                                 buildString {
-                                    Constants.FUCKLIST.forEach {
+                                    packageList.forEach {
                                         append("pm suspend $it")
                                         appendLine()
                                     }