br0kenpixel/KernelSU-Next
1
0
Fork 0
mirror of https://github.com/KernelSU-Next/KernelSU-Next.git synced 2025-08-27 23:46:34 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

manager: use myUserId as fallback #429 (#432)

Browse Source
This commit is contained in:
Der_Googler
2025-05-23 16:34:09 +02:00
committed by GitHub
parent 407826396b
commit ea4b8f51c2
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manager/app/src/main/java/com/rifsxd/ksunext/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
@@ -18,8 +19,7 @@ import kotlinx.parcelize.Parcelize
import com.rifsxd.ksunext.Natives import com.rifsxd.ksunext.Natives
import com.rifsxd.ksunext.ksuApp import com.rifsxd.ksunext.ksuApp
import com.rifsxd.ksunext.ui.util.HanziToPinyin import com.rifsxd.ksunext.ui.util.HanziToPinyin
import com.rifsxd.ksunext.ui.webui.packageManager import com.rifsxd.ksunext.ui.webui.getInstalledPackagesAll
import com.rifsxd.ksunext.ui.webui.userManager
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.withTimeoutOrNull import kotlinx.coroutines.withTimeoutOrNull
import java.text.Collator import java.text.Collator
@@ -109,9 +109,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

17
manager/app/src/main/java/com/rifsxd/ksunext/ui/webui/KsuLibSuProvider.kt
View File

@@ -1,6 +1,7 @@
package com.rifsxd.ksunext.ui.webui package com.rifsxd.ksunext.ui.webui
import android.content.ServiceConnection import android.content.ServiceConnection
import android.content.pm.PackageInfo
import android.util.Log import android.util.Log
import com.dergoogler.mmrl.platform.Platform import com.dergoogler.mmrl.platform.Platform
import com.dergoogler.mmrl.platform.hiddenApi.HiddenPackageManager import com.dergoogler.mmrl.platform.hiddenApi.HiddenPackageManager
@@ -56,5 +57,17 @@ suspend fun initPlatform() = withContext(Dispatchers.IO) {
} }
} }
val Platform.Companion.packageManager get(): HiddenPackageManager = HiddenPackageManager(this.mService) fun Platform.Companion.getInstalledPackagesAll(catch: (Exception) -> Unit = {}): List<PackageInfo> =
val Platform.Companion.userManager get(): HiddenUserManager = HiddenUserManager(this.mService) 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)
}