Refactor package retrieval to HiddenPackageManager

Moved the getInstalledPackagesAll logic from SuperUserViewModel to HiddenPackageManager for better separation of concerns. Updated usage in SuperUserViewModel to use the new method. Also added error logging and a TAG constant to HiddenPackageManager, and removed unused Compose imports and code from App.kt.

Author: DerGoogler

app/src/main/kotlin/com/dergoogler/mmrl/App.kt

@@ -2,8 +2,6 @@ package com.dergoogler.mmrl
 
 import android.app.Application
 import android.content.Context
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import com.dergoogler.mmrl.app.utils.NotificationUtils
 import com.dergoogler.mmrl.network.NetworkUtils
 import com.dergoogler.mmrl.platform.PlatformManager
@@ -21,10 +19,6 @@ class App : Application() {
         super.onCreate()
         app = this
 
-        Modifier.composed {
-            Modifier
-        }
-
         PlatformManager.setHiddenApiExemptions()
 
         NotificationUtils.init(this)

app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/SuperUserViewModel.kt

@@ -169,7 +169,8 @@ class SuperUserViewModel @Inject constructor(
 
     private fun getAppList(): List<AppInfo> {
         val pm = context.packageManager
-        val packages = PlatformManager.getInstalledPackagesAll()
+        val packages =
+            PlatformManager.packageManager.getInstalledPackagesAll(PlatformManager.userManager, 0)
         return packages.map { pkg ->
             val appInfo = pkg.applicationInfo!!
             val uid = appInfo.uid
@@ -221,17 +222,4 @@ class SuperUserViewModel @Inject constructor(
         val items: List<AppInfo> = emptyList(),
         val isRefreshing: Boolean = false,
     )
-
-    private fun PlatformManager.getInstalledPackagesAll(): List<PackageInfo> {
-        return try {
-            val packages = mutableListOf<PackageInfo>()
-            val userInfos = userManager.getUsers()
-            for (userInfo in userInfos) {
-                packages.addAll(packageManager.getInstalledPackages(0, userInfo.id))
-            }
-            packages
-        } catch (_: Exception) {
-            packageManager.getInstalledPackages(0, userManager.myUserId)
-        }
-    }
 }

platform/src/main/kotlin/com/dergoogler/mmrl/platform/hiddenApi/HiddenPackageManager.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.dergoogler.mmrl.platform.hiddenApi
 
 import android.content.Intent
@@ -6,12 +8,13 @@ import android.content.pm.IPackageManager
 import android.content.pm.PackageInfo
 import android.content.pm.ResolveInfo
 import android.os.SystemProperties
+import android.util.Log
 import com.dergoogler.mmrl.compat.BuildCompat
 import com.dergoogler.mmrl.platform.PlatformManager.getSystemService
 import com.dergoogler.mmrl.platform.stub.IServiceManager
 
 class HiddenPackageManager(
-    private val service: IServiceManager
+    private val service: IServiceManager,
 ) {
     private val packageManager by lazy {
         IPackageManager.Stub.asInterface(
@@ -59,11 +62,28 @@ class HiddenPackageManager(
         }.list
     }
 
+    fun getInstalledPackagesAll(userManager: HiddenUserManager, flags: Int = 0): List<PackageInfo> {
+        return try {
+            val packages = mutableListOf<PackageInfo>()
+            val userInfos = userManager.getUsers()
+            for (userInfo in userInfos) {
+                packages.addAll(getInstalledPackages(flags, userInfo.id))
+            }
+            packages
+        } catch (e: Exception) {
+            Log.e(TAG, "getInstalledPackagesAll", e)
+            getInstalledPackages(0, userManager.myUserId)
+        } catch (e: Exception) {
+            Log.e(TAG, "getInstalledPackagesAll", e)
+            emptyList()
+        }
+    }
+
     fun queryIntentActivities(
         intent: Intent,
         resolvedType: String?,
         flags: Int,
-        userId: Int
+        userId: Int,
     ): List<ResolveInfo> {
         return if (BuildCompat.atLeastT) {
             packageManager.queryIntentActivities(intent, resolvedType, flags.toLong(), userId)
@@ -113,4 +133,8 @@ class HiddenPackageManager(
             null
         )
     }
+
+    companion object {
+        const val TAG = "HiddenPackageManager"
+    }
 }