Merge pull request #131 from GuoXiCheng/dev

add system apps filter to whitelist
GuoXiCheng · Feb 6, 2024 · e516db1 · e516db1
2 parents 4cbcc8e + 8553b70
commit e516db1
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - release
 env:
-  LATEST_VERSION: "2.0.0"
+  LATEST_VERSION: "2.1.0"
 
 jobs:
   build-and-deploy:

diff --git a/apk/SKIP-v2.1.0.apk b/apk/SKIP-v2.1.0.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 24
         targetSdk 32
         versionCode 1
-        versionName "2.0.0"
+        versionName "2.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/android/skip/BaseActivity.kt b/app/src/main/java/com/android/skip/BaseActivity.kt
@@ -21,6 +21,8 @@ const val WHITELIST_DOT = "whitelist."
 
 const val SKIP_PERMIT_NOTICE = "SKIP_PERMIT_NOTICE"
 
+const val SKIP_INCLUDE_SYSTEM_APPS = "SKIP_INCLUDE_SYSTEM_APPS"
+
 val themeTypeState: MutableState<Int> by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
     mutableStateOf(DataStoreUtils.getSyncData(SKIP_APP_THEME, Configuration.UI_MODE_NIGHT_NO))
 }

diff --git a/app/src/main/java/com/android/skip/SettingsActivity.kt b/app/src/main/java/com/android/skip/SettingsActivity.kt
@@ -69,9 +69,30 @@ fun SettingsActivityInterface(onBackClick: () -> Unit) {
         )
     }
 
+    val checkIncludeSystemApps = remember {
+        mutableStateOf(
+            DataStoreUtils.getSyncData(
+                SKIP_INCLUDE_SYSTEM_APPS, false
+            )
+        )
+    }
+
     ScaffoldPage(
         barTitle = stringResource(id = R.string.settings),
         onBackClick = onBackClick, content = {
+            FlatButton(content = {
+                RowContent(
+                    stringResource(id = R.string.settings_include_system_apps_title),
+                    stringResource(id = R.string.settings_include_system_apps_subtitle),
+                    { ResourceIcon(iconResource = R.drawable.app_registration) },
+                    checkIncludeSystemApps.value,
+                    {
+                        checkIncludeSystemApps.value = it
+                        DataStoreUtils.putSyncData(SKIP_INCLUDE_SYSTEM_APPS, it)
+                    }
+                )
+            })
+
             FlatButton(
                 content = {
                     RowContent(

diff --git a/app/src/main/java/com/android/skip/WhitelistActivity.kt b/app/src/main/java/com/android/skip/WhitelistActivity.kt
@@ -44,12 +44,17 @@ fun WhitelistInterface(onBackClick: () -> Unit) {
 
     LaunchedEffect(Unit) {
         scope.launch(Dispatchers.IO) {
-            val installedApps =
+            var installedApps =
                 packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
-            val nonSystemApps = installedApps.filter {
-                (it.flags and ApplicationInfo.FLAG_SYSTEM) == 0
+
+            // 是否过滤掉系统应用
+            if (!DataStoreUtils.getSyncData(SKIP_INCLUDE_SYSTEM_APPS, false)) {
+                installedApps = installedApps.filter {
+                    (it.flags and ApplicationInfo.FLAG_SYSTEM) == 0
+                }
             }
-            val apps = nonSystemApps.map { app ->
+
+            val apps = installedApps.map { app ->
                 AppInfo(
                     appName = app.loadLabel(packageManager).toString(),
                     packageName = app.packageName,

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -25,6 +25,8 @@
     <string name="settings_sync_config_subtitle">打开应用时自动获取并更新配置文件</string>
     <string name="settings_permit_notice_title">允许通知</string>
     <string name="settings_permit_notice_subtitle">是否允许发送「跳过」通知</string>
+    <string name="settings_include_system_apps_title">列出系统应用</string>
+    <string name="settings_include_system_apps_subtitle">应用白名单中是否包含系统应用</string>
 
     <string name="alive">应用保活</string>
     <string name="alive_power_saving_title">省电策略</string>