android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

manager: use myUserId as fallback

Browse Source 
Co-authored-by: Der_Googler <54764558+DerGoogler@users.noreply.github.com>
Signed-off-by: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
This commit is contained in:
ShirkNeko
2025-05-27 16:33:58 +08:00
parent f196bf5b76
commit 64f0efc2c0
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt
View File

@@ -5,6 +5,7 @@ import android.content.pm.PackageInfo
import android.os.Parcelable import android.os.Parcelable
import android.os.SystemClock import android.os.SystemClock
import android.util.Log import android.util.Log
import android.widget.Toast
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
@@ -20,6 +21,7 @@ import java.text.Collator
import java.util.* import java.util.*
import com.dergoogler.mmrl.platform.Platform import com.dergoogler.mmrl.platform.Platform
import com.dergoogler.mmrl.platform.TIMEOUT_MILLIS import com.dergoogler.mmrl.platform.TIMEOUT_MILLIS
import com.sukisu.ultra.ui.webui.getInstalledPackagesAll
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.withTimeoutOrNull import kotlinx.coroutines.withTimeoutOrNull
@@ -187,9 +189,10 @@ class SuperUserViewModel : ViewModel() {
val pm = ksuApp.packageManager val pm = ksuApp.packageManager
val start = SystemClock.elapsedRealtime() val start = SystemClock.elapsedRealtime()
val userManager = Platform.userManager val packages = Platform.getInstalledPackagesAll {
val packageManager = Platform.packageManager Log.e(TAG, "getInstalledPackagesAll:", it)
val packages = packageManager.getInstalledPackages(0, userManager.myUserId) Toast.makeText(ksuApp, "Something went wrong, check logs", Toast.LENGTH_SHORT).show()
}
apps = packages.map { apps = packages.map {
val appInfo = it.applicationInfo val appInfo = it.applicationInfo
val uid = appInfo!!.uid val uid = appInfo!!.uid

16
manager/app/src/main/java/com/sukisu/ultra/ui/webui/KsuLibSuProvider.kt
View File

@@ -2,6 +2,7 @@ package com.sukisu.ultra.ui.webui
import android.content.ServiceConnection import android.content.ServiceConnection
import android.util.Log import android.util.Log
import android.content.pm.PackageInfo
import com.dergoogler.mmrl.platform.Platform import com.dergoogler.mmrl.platform.Platform
import com.dergoogler.mmrl.platform.model.IProvider import com.dergoogler.mmrl.platform.model.IProvider
import com.dergoogler.mmrl.platform.model.PlatformIntent import com.dergoogler.mmrl.platform.model.PlatformIntent
@@ -54,3 +55,18 @@ suspend fun initPlatform() = withContext(Dispatchers.IO) {
return@withContext false return@withContext false
} }
} }
fun Platform.Companion.getInstalledPackagesAll(catch: (Exception) -> Unit = {}): List<PackageInfo> =
try {
val packages = mutableListOf<PackageInfo>()
val userInfos = userManager.getUsers()
for (userInfo in userInfos) {
packages.addAll(packageManager.getInstalledPackages(0, userInfo.id))
}
packages
} catch (e: Exception) {
catch(e)
packageManager.getInstalledPackages(0, userManager.myUserId)
}