diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts index df821b47..8b7c017b 100644 --- a/manager/app/build.gradle.kts +++ b/manager/app/build.gradle.kts @@ -34,7 +34,6 @@ android { } buildFeatures { - aidl = true buildConfig = true compose = true prefab = true diff --git a/manager/app/src/main/aidl/com/rifsxd/ksunext/IKsuInterface.aidl b/manager/app/src/main/aidl/com/rifsxd/ksunext/IKsuInterface.aidl deleted file mode 100644 index 899e79b8..00000000 --- a/manager/app/src/main/aidl/com/rifsxd/ksunext/IKsuInterface.aidl +++ /dev/null @@ -1,9 +0,0 @@ -// IKsuInterface.aidl -package com.rifsxd.ksunext; - -import android.content.pm.PackageInfo; -import rikka.parcelablelist.ParcelableListSlice; - -interface IKsuInterface { - ParcelableListSlice getPackages(int flags); -} \ No newline at end of file diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/viewmodel/SuperUserViewModel.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/viewmodel/SuperUserViewModel.kt index 2288fd5f..70a3b2a4 100644 --- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/viewmodel/SuperUserViewModel.kt +++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/viewmodel/SuperUserViewModel.kt @@ -109,14 +109,9 @@ class SuperUserViewModel : ViewModel() { val pm = ksuApp.packageManager val start = SystemClock.elapsedRealtime() - val userInfos = Platform.userManager.getUsers() - val packages = mutableListOf() + val userManager = Platform.userManager val packageManager = Platform.packageManager - - for (userInfo in userInfos) { - Log.i(TAG, "fetchAppList: ${userInfo.id}") - packages.addAll(packageManager.getInstalledPackages(0, userInfo.id)) - } + val packages = packageManager.getInstalledPackages(0, userManager.myUserId) apps = packages.map { val appInfo = it.applicationInfo diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/webui/WebViewInterface.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/webui/WebViewInterface.kt index a33c1e09..1e4b2c20 100644 --- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/webui/WebViewInterface.kt +++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/webui/WebViewInterface.kt @@ -9,8 +9,8 @@ import android.webkit.JavascriptInterface import android.widget.Toast import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat +import com.dergoogler.mmrl.webui.interfaces.WXInterface import com.dergoogler.mmrl.webui.interfaces.WXOptions -import com.dergoogler.mmrl.webui.interfaces.WebUIInterface import com.dergoogler.mmrl.webui.model.JavaScriptInterface import com.topjohnwu.superuser.CallbackList import com.topjohnwu.superuser.ShellUtils @@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture class WebViewInterface( wxOptions: WXOptions, -) : WebUIInterface(wxOptions) { +) : WXInterface(wxOptions) { override var name: String = "ksu" companion object { @@ -185,7 +185,7 @@ class WebViewInterface( @JavascriptInterface fun moduleInfo(): String { val moduleInfos = JSONArray(listModules()) - var currentModuleInfo = JSONObject() + val currentModuleInfo = JSONObject() currentModuleInfo.put("moduleDir", modDir) val moduleId = File(modDir).getName() for (i in 0 until moduleInfos.length()) { @@ -195,7 +195,7 @@ class WebViewInterface( continue } - var keys = currentInfo.keys() + val keys = currentInfo.keys() for (key in keys) { currentModuleInfo.put(key, currentInfo.get(key)) } diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml index dfc433ff..9504ae1f 100644 --- a/manager/gradle/libs.versions.toml +++ b/manager/gradle/libs.versions.toml @@ -17,7 +17,7 @@ parcelablelist = "2.0.1" libsu = "6.0.0" apksign = "1.4" cmaker = "1.2" -mmrl = "v33560" +mmrl = "346470abb8" [plugins] agp-app = { id = "com.android.application", version.ref = "agp" }