1 files changed, 9 insertions, 9 deletions

diff --git a/app/src/main/java/moe/yuuta/workmode/utils/Utils.kt b/app/src/main/java/moe/yuuta/workmode/utils/Utils.kt
index 75a98e9..10bef07 100644
--- a/app/src/main/java/moe/yuuta/workmode/utils/Utils.kt
+++ b/app/src/main/java/moe/yuuta/workmode/utils/Utils.kt
@@ -61,7 +61,7 @@ object Utils {
     fun buildGeneralApplicationInfoFilter(context: Context): Predicate<ApplicationInfo> {
         val i = Intent(Intent.ACTION_MAIN)
         i.addCategory(Intent.CATEGORY_HOME)
-        val launchers = context.packageManager.queryIntentActivities(i, 0)
+        val launchers = context.packageManager.queryIntentActivities(i, PackageManager.MATCH_DISABLED_COMPONENTS)
                 .stream()
                 .map {
                     return@map it.resolvePackageName
@@ -99,7 +99,7 @@ object Utils {
     fun buildGeneralSuspendedAppInfoFilter(context: Context): Predicate<TransferableSuspendedApp> {
         val i = Intent(Intent.ACTION_MAIN)
         i.addCategory(Intent.CATEGORY_HOME)
-        val launchers = context.packageManager.queryIntentActivitiesAsUser(i, 0, context.userId)
+        val launchers = context.packageManager.queryIntentActivitiesAsUser(i, PackageManager.MATCH_DISABLED_COMPONENTS, context.userId)
                 .stream()
                 .map {
                     return@map it.resolvePackageName
@@ -144,7 +144,7 @@ object Utils {
         val intentToResolve = Intent(Intent.ACTION_MAIN)
         intentToResolve.addCategory(Intent.CATEGORY_INFO)
         intentToResolve.setPackage(packageName)
-        var ris: List<ResolveInfo>? = pm.queryIntentActivitiesAsUser(intentToResolve, 0, userId)
+        var ris: List<ResolveInfo>? = pm.queryIntentActivitiesAsUser(intentToResolve, PackageManager.MATCH_DISABLED_COMPONENTS, userId)
 
         // Otherwise, try to find a main launcher activity.
         if (ris == null || ris.size <= 0) {
@@ -152,7 +152,7 @@ object Utils {
             intentToResolve.removeCategory(Intent.CATEGORY_INFO)
             intentToResolve.addCategory(Intent.CATEGORY_LAUNCHER)
             intentToResolve.setPackage(packageName)
-            ris = pm.queryIntentActivitiesAsUser(intentToResolve, 0, userId)
+            ris = pm.queryIntentActivitiesAsUser(intentToResolve, PackageManager.MATCH_DISABLED_COMPONENTS, userId)
         }
         if (ris == null || ris.size <= 0) {
             return null
@@ -206,12 +206,12 @@ object Utils {
     }
 
     fun canSafelyLoadAppInfo(packageInfo: PersistableSuspendedApp, context: Context): Boolean {
-        return packageInfo.userId == Process.myUserHandle().hashCode() ||
+        return packageInfo.userId == Process.myUserHandle().hashCode() &&
                 isAppInstalledInCurrentUser(packageInfo.packageName, context)
     }
 
     fun canSafelyLoadAppInfo(packageInfo: TransferableSuspendedApp, userId: Int, context: Context): Boolean {
-        return packageInfo.userId == userId ||
+        return packageInfo.userId == userId &&
                 isAppInstalledInUser(packageInfo.packageName, context, userId)
     }
 
@@ -221,11 +221,11 @@ object Utils {
 
     @SystemApi
     fun isAppInstalledInUser(packageName: String, context: Context, userId: Int): Boolean {
-        try {
+        return try {
             context.packageManager.getPackageInfoAsUser(packageName, PackageManager.GET_DISABLED_COMPONENTS, userId)
-            return true
+            true
         } catch (e: PackageManager.NameNotFoundException) {
-            return false
+            false
         }
     }
 }
\ No newline at end of file