feat: enhanced app permission management (#229)

Author: BinTianqi

app/build.gradle.kts

@@ -62,10 +62,11 @@ android {
     dependenciesInfo {
         includeInApk = false
     }
-    composeCompiler {
-        includeSourceInformation = false
-        includeTraceMarkers = false
-    }
+}
+
+composeCompiler {
+    includeSourceInformation = false
+    includeTraceMarkers = false
 }
 
 kotlin {

app/src/main/java/com/bintianqi/owndroid/LockTaskService.kt

@@ -7,12 +7,9 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.pm.ServiceInfo
-import android.os.Build
 import android.os.IBinder
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
-import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -50,10 +47,7 @@ class LockTaskService: Service() {
             .setOngoing(true)
             .setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_IMMEDIATE)
             .build()
-        ServiceCompat.startForeground(
-            this, NotificationType.LockTaskMode.id, notification,
-            if (Build.VERSION.SDK_INT < 34) 0 else ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
-        )
+        startForeground(NotificationType.LockTaskMode.id, notification)
         coroutineScope.launch {
             val am = getSystemService(ActivityManager::class.java)
             delay(3000)

app/src/main/java/com/bintianqi/owndroid/MainActivity.kt

@@ -165,8 +165,12 @@ import com.bintianqi.owndroid.dpm.PasswordInfoScreen
 import com.bintianqi.owndroid.dpm.PasswordScreen
 import com.bintianqi.owndroid.dpm.PermissionPolicy
 import com.bintianqi.owndroid.dpm.PermissionPolicyScreen
-import com.bintianqi.owndroid.dpm.PermissionsManager
-import com.bintianqi.owndroid.dpm.PermissionsManagerScreen
+import com.bintianqi.owndroid.dpm.AppPermissionsManager
+import com.bintianqi.owndroid.dpm.AppPermissionsManagerScreen
+import com.bintianqi.owndroid.dpm.PermissionDetail
+import com.bintianqi.owndroid.dpm.PermissionDetailScreen
+import com.bintianqi.owndroid.dpm.PermissionManager
+import com.bintianqi.owndroid.dpm.PermissionManagerScreen
 import com.bintianqi.owndroid.dpm.PermittedAccessibilityServices
 import com.bintianqi.owndroid.dpm.PermittedAsAndImPackages
 import com.bintianqi.owndroid.dpm.PermittedInputMethods
@@ -566,10 +570,17 @@ fun Home(vm: MyViewModel, onLock: () -> Unit) {
                 ::navigateToAppGroups, vm.appGroups, R.string.info_disable_user_control
             )
         }
-        composable<PermissionsManager> {
-            PermissionsManagerScreen(
-                vm.packagePermissions, vm::getPackagePermissions, vm::setPackagePermission,
-                ::navigateUp, it.toRoute(), vm.chosenPackage, ::chooseSinglePackage
+        composable<AppPermissionsManager> {
+            AppPermissionsManagerScreen(
+                vm::getPackagePermissions, vm::setPackagePermission, ::navigateUp, it.toRoute()
+            )
+        }
+        composable<PermissionManager> {
+            PermissionManagerScreen(::navigate, ::navigateUp)
+        }
+        composable<PermissionDetail> {
+            PermissionDetailScreen(
+                it.toRoute(), vm::getPermissionPackages, vm::setPackagePermission, ::navigateUp
             )
         }
         composable<DisableMeteredData> {

app/src/main/java/com/bintianqi/owndroid/MyRepository.kt

@@ -272,6 +272,6 @@ class MyRepository(val dbHelper: MyDbHelper) {
         return list
     }
     fun deleteAllCrossProfileIntentFilters() {
-        dbHelper.writableDatabase.delete("cross_profile_intent_filters", null, null);
+        dbHelper.writableDatabase.delete("cross_profile_intent_filters", null, null)
     }
 }

app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt

@@ -107,7 +107,6 @@ import com.bintianqi.owndroid.dpm.doUserOperationWithContext
 import com.bintianqi.owndroid.dpm.getPackageInstaller
 import com.bintianqi.owndroid.dpm.globalSettings
 import com.bintianqi.owndroid.dpm.handlePrivilegeChange
-import com.bintianqi.owndroid.dpm.isValidPackageName
 import com.bintianqi.owndroid.dpm.parsePackageInstallerMessage
 import com.bintianqi.owndroid.dpm.runtimePermissions
 import com.bintianqi.owndroid.dpm.secureSettings
@@ -280,20 +279,23 @@ class MyViewModel(application: Application): AndroidViewModel(application) {
         getUcdPackages()
     }
 
-    val packagePermissions = MutableStateFlow(emptyMap<String, Int>())
-    fun getPackagePermissions(name: String) {
-        if (name.isValidPackageName) {
-            packagePermissions.value = runtimePermissions.associate {
-                it.id to DPM.getPermissionGrantState(DAR, name, it.id)
-            }
-        } else {
-            packagePermissions.value = emptyMap()
+    fun getPackagePermissions(name: String): Map<String, Int> {
+        return runtimePermissions.associate {
+            it.id to DPM.getPermissionGrantState(DAR, name, it.id)
         }
     }
     fun setPackagePermission(name: String, permission: String, status: Int): Boolean {
-        val result = DPM.setPermissionGrantState(DAR, name, permission, status)
-        getPackagePermissions(name)
-        return result
+        return DPM.setPermissionGrantState(DAR, name, permission, status)
+    }
+    fun getPermissionPackages(permission: String): List<Pair<AppInfo, Int>> {
+        return PM.getInstalledPackages(
+            getInstalledAppsFlags or PackageManager.GET_PERMISSIONS
+        ).filter {
+            it.requestedPermissions?.contains(permission) ?: false
+        }.map {
+            getAppInfo(it.packageName) to
+                    DPM.getPermissionGrantState(DAR, it.packageName, permission)
+        }
     }
 
     // Metered data disabled packages

app/src/main/java/com/bintianqi/owndroid/PackageChooser.kt

@@ -1,7 +1,6 @@
 package com.bintianqi.owndroid
 
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.os.Build
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -276,6 +275,3 @@ fun AppChooserScreen(
         }
     }
 }
-
-val getInstalledAppsFlags =
-    if(Build.VERSION.SDK_INT >= 24) PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.MATCH_UNINSTALLED_PACKAGES else 0

app/src/main/java/com/bintianqi/owndroid/Utils.kt

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.widget.Toast
@@ -179,3 +180,6 @@ fun registerPackageRemovedReceiver(
 }
 
 fun parsePackageNames(input: String) = input.split('\n').filter { it.isNotEmpty() }
+
+val getInstalledAppsFlags =
+    if(Build.VERSION.SDK_INT >= 24) PackageManager.MATCH_DISABLED_COMPONENTS or PackageManager.MATCH_UNINSTALLED_PACKAGES else 0