Dhizuku v2.8

Add DelegatedScopes interface.

app/build.gradle.kts

@@ -22,8 +22,8 @@ android {
         applicationId = "com.rosan.dhizuku"
         minSdk = 21
         targetSdk = 33
-        versionCode = 10
-        versionName = "2.7"
+        versionCode = 11
+        versionName = "2.8"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/rosan/dhizuku/App.kt

@@ -2,15 +2,16 @@ package com.rosan.dhizuku
 
 import android.app.Application
 import android.app.admin.DevicePolicyManager
-import android.content.ComponentName
 import android.content.Context
+import android.os.Build
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import com.rosan.dhizuku.data.settings.repo.AppRepo
 import com.rosan.dhizuku.di.init.appModules
-import com.rosan.dhizuku.server.DhizukuDAReceiver
 import com.rosan.dhizuku.server.DhizukuService
+import com.rosan.dhizuku.shared.DhizukuVariables
+import com.rosan.dhizuku.util.clearDelegatedScopes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -27,6 +28,10 @@ class App : Application(), KoinComponent {
 
     private val appRepo by inject<AppRepo>()
 
+    private val devicePolicyManager by lazy {
+        getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    }
+
     var isDeviceAdminer by mutableStateOf(false)
         private set
 
@@ -54,10 +59,9 @@ class App : Application(), KoinComponent {
     }
 
     fun syncOwnerStatus() {
-        val manager = getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
-        isDeviceAdminer = manager.isAdminActive(ComponentName(this, DhizukuDAReceiver::class.java))
-        isDeviceOwner = manager.isDeviceOwnerApp(packageName)
-        isProfileOwner = manager.isProfileOwnerApp(packageName)
+        isDeviceAdminer = devicePolicyManager.isAdminActive(DhizukuVariables.COMPONENT_NAME)
+        isDeviceOwner = devicePolicyManager.isDeviceOwnerApp(packageName)
+        isProfileOwner = devicePolicyManager.isProfileOwnerApp(packageName)
         isOwner = isDeviceOwner || isProfileOwner
     }
 
@@ -67,7 +71,12 @@ class App : Application(), KoinComponent {
                 if (
                     packageManager.getPackagesForUid(it.uid).isNullOrEmpty() ||
                     !it.allowApi
-                ) appRepo.delete(it)
+                ) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        clearDelegatedScopes(it.uid)
+                    }
+                    appRepo.delete(it)
+                }
             }
         }
     }

app/src/main/java/com/rosan/dhizuku/server/DhizukuConstants.kt

@@ -1,5 +1,5 @@
 package com.rosan.dhizuku.server
 
-val DHIZUKU_SERVRE_VERSION_CODE = 4
+val DHIZUKU_SERVRE_VERSION_CODE = 5
 
-val DHIZUKU_SERVER_VERSION_NAME = "1.4"
+val DHIZUKU_SERVER_VERSION_NAME = "1.5"

app/src/main/java/com/rosan/dhizuku/server/impl/IDhizukuImpl.kt

@@ -1,16 +1,20 @@
 package com.rosan.dhizuku.server.impl
 
+import android.app.admin.DevicePolicyManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Binder
+import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.os.Parcel
+import androidx.annotation.RequiresApi
 import com.rosan.dhizuku.R
 import com.rosan.dhizuku.aidl.IDhizuku
 import com.rosan.dhizuku.aidl.IDhizukuClient
 import com.rosan.dhizuku.aidl.IDhizukuRemoteProcess
 import com.rosan.dhizuku.aidl.IDhizukuUserServiceConnection
+import com.rosan.dhizuku.data.reflect.repo.ReflectRepo
 import com.rosan.dhizuku.data.settings.repo.AppRepo
 import com.rosan.dhizuku.server.DHIZUKU_SERVER_VERSION_NAME
 import com.rosan.dhizuku.server.DHIZUKU_SERVRE_VERSION_CODE
@@ -32,6 +36,12 @@ class IDhizukuImpl(private val client: IDhizukuClient? = null) : IDhizuku.Stub()
 
     private val context by inject<Context>()
 
+    private val reflect by inject<ReflectRepo>()
+
+    private val devicePolicyManager by lazy {
+        context.getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    }
+
     private val appRepo by inject<AppRepo>()
 
     override fun getVersionCode(): Int = DHIZUKU_SERVRE_VERSION_CODE
@@ -98,6 +108,23 @@ class IDhizukuImpl(private val client: IDhizukuClient? = null) : IDhizuku.Stub()
         DhizukuUserServiceConnections.unbind(uid, pid, args)
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun getDelegatedScopes(packageName: String): Array<String> {
+        requireCallingPermission("get_delegated_scopes")
+        return devicePolicyManager.getDelegatedScopes(DhizukuVariables.COMPONENT_NAME, packageName)
+            .toTypedArray()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun setDelegatedScopes(packageName: String, scopes: Array<out String>) {
+        requireCallingPermission("set_delegated_scopes")
+        return devicePolicyManager.setDelegatedScopes(
+            DhizukuVariables.COMPONENT_NAME,
+            packageName,
+            scopes.toList()
+        )
+    }
+
     override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean {
         if (code == DhizukuVariables.TRANSACT_CODE_REMOTE_BINDER) {
             val targetData = Parcel.obtain()

app/src/main/java/com/rosan/dhizuku/ui/activity/SettingsActivity.kt

@@ -1,17 +1,14 @@
 package com.rosan.dhizuku.ui.activity
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.imePadding
-import androidx.compose.material.AlertDialog
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import com.hjq.permissions.Permission
 import com.hjq.permissions.XXPermissions
-import com.rosan.dhizuku.server.DhizukuService
 import com.rosan.dhizuku.ui.page.settings.SettingsPage
 import com.rosan.dhizuku.ui.theme.InstallerTheme
 import kotlinx.coroutines.CoroutineScope

app/src/main/java/com/rosan/dhizuku/ui/page/settings/config/ConfigViewModel.kt

@@ -1,6 +1,7 @@
 package com.rosan.dhizuku.ui.page.settings.config
 
 import android.content.Context
+import android.os.Build
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -9,6 +10,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.rosan.dhizuku.data.settings.model.room.entity.AppEntity
 import com.rosan.dhizuku.data.settings.repo.AppRepo
+import com.rosan.dhizuku.util.clearDelegatedScopes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -97,6 +99,9 @@ class ConfigViewModel(
                 return@launch
             }
             entity.allowApi = allowApi
+            if (!allowApi && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                context.clearDelegatedScopes(entity.uid)
+            }
             repo.update(entity)
         }
     }

app/src/main/java/com/rosan/dhizuku/util/ContextUtil.kt

@@ -1,12 +1,16 @@
 package com.rosan.dhizuku.util
 
+import android.app.admin.DevicePolicyManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
+import com.rosan.dhizuku.shared.DhizukuVariables
 
 fun Context.openUrlInBrowser(url: String) {
     val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
@@ -22,4 +26,17 @@ fun Context.toast(text: CharSequence, duration: Int = Toast.LENGTH_SHORT) {
 
 fun Context.toast(@StringRes resId: Int, duration: Int = Toast.LENGTH_SHORT) {
     toast(getString(resId), duration)
-}
+}
+
+@RequiresApi(Build.VERSION_CODES.O)
+fun Context.clearDelegatedScopes(uid: Int) {
+    val packageNames = packageManager.getPackagesForUid(uid) ?: emptyArray()
+    val devicePolicyManager = getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    packageNames.forEach {
+        devicePolicyManager.setDelegatedScopes(
+            DhizukuVariables.COMPONENT_NAME,
+            it,
+            emptyList()
+        )
+    }
+}