From 99fe6623de7d519ae3f949f65df7dfca32f7a8fa Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Fri, 23 May 2025 16:31:13 +0800
Subject: [PATCH] manager:  possible fix

- Possible fix a bug where IUserManager.getUsers(ZZZ) are not defined in the framework.jar
- Refactored WebUI X to meet the new WXInterface
- Only fetch the app from the current user and not all users

* manager: remove unused AIDL interfaces

Signed-off-by: Der_Googler <54764558+DerGoogler@users.noreply.github.com>
---
 manager/app/build.gradle.kts                           |  1 -
 .../src/main/aidl/com/sukisu/zako/IKsuInterface.aidl   |  8 --------
 .../sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt    | 10 ++--------
 .../java/com/sukisu/ultra/ui/webui/WebViewInterface.kt |  4 ++--
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 manager/app/src/main/aidl/com/sukisu/zako/IKsuInterface.aidl

diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts
index 2dbbaec6..0fc2b32a 100644
--- a/manager/app/build.gradle.kts
+++ b/manager/app/build.gradle.kts
@@ -50,7 +50,6 @@ android {
     }
 
     buildFeatures {
-        aidl = true
         buildConfig = true
         compose = true
         prefab = true
diff --git a/manager/app/src/main/aidl/com/sukisu/zako/IKsuInterface.aidl b/manager/app/src/main/aidl/com/sukisu/zako/IKsuInterface.aidl
deleted file mode 100644
index 93f84492..00000000
--- a/manager/app/src/main/aidl/com/sukisu/zako/IKsuInterface.aidl
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.sukisu.zako;
-
-import android.content.pm.PackageInfo;
-import rikka.parcelablelist.ParcelableListSlice;
-
-interface IKsuInterface {
-    ParcelableListSlice<PackageInfo> getPackages(int flags);
-}
\ No newline at end of file
diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt
index f76514d8..3f501199 100644
--- a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt
@@ -187,15 +187,9 @@ class SuperUserViewModel : ViewModel() {
             val pm = ksuApp.packageManager
             val start = SystemClock.elapsedRealtime()
 
-            val userInfos = Platform.userManager.getUsers()
-            val packages = mutableListOf<PackageInfo>()
+            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
                 val uid = appInfo!!.uid
diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/webui/WebViewInterface.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/webui/WebViewInterface.kt
index 0f177f2c..fef87f33 100644
--- a/manager/app/src/main/java/com/sukisu/ultra/ui/webui/WebViewInterface.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/ui/webui/WebViewInterface.kt
@@ -226,7 +226,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()) {
@@ -236,7 +236,7 @@ class WebViewInterface(
                 continue
             }
 
-            var keys = currentInfo.keys()
+            val keys = currentInfo.keys()
             for (key in keys) {
                 currentModuleInfo.put(key, currentInfo.get(key))
             }