Fixed: Uninstall and app info for work profile apps #446

3 files changed, 8 insertions, 7 deletions

diff --git a/app/src/main/java/app/olauncher/helper/Utils.kt b/app/src/main/java/app/olauncher/helper/Utils.kt
index 466bcd1..1809068 100644
--- a/app/src/main/java/app/olauncher/helper/Utils.kt
+++ b/app/src/main/java/app/olauncher/helper/Utils.kt
@@ -325,11 +325,11 @@ fun getChangedAppTheme(context: Context, currentAppTheme: Int): Int {
 
 fun openAppInfo(context: Context, userHandle: UserHandle, packageName: String) {
     val launcher = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
-    val intent: Intent? = context.packageManager.getLaunchIntentForPackage(packageName)
-
-    intent?.let {
-        launcher.startAppDetailsActivity(intent.component, userHandle, null, null)
-    } ?: context.showToast(context.getString(R.string.unable_to_open_app))
+    val component = launcher.getActivityList(packageName, userHandle).firstOrNull()?.componentName
+    if (component != null)
+        launcher.startAppDetailsActivity(component, userHandle, null, null)
+    else
+        context.showToast(context.getString(R.string.unable_to_open_app_info))
 }
 
 suspend fun getBitmapFromURL(src: String?): Bitmap? {
diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
index cda765e..ef7add1 100644
--- a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
@@ -2,6 +2,7 @@ package app.olauncher.ui
 
 import android.os.Build
 import android.os.Bundle
+import android.os.Process
 import android.text.Spannable
 import android.view.LayoutInflater
 import android.view.View
@@ -25,7 +26,6 @@ import app.olauncher.databinding.FragmentAppDrawerBinding
 import app.olauncher.helper.deletePinnedShortcut
 import app.olauncher.helper.hideKeyboard
 import app.olauncher.helper.isEinkDisplay
-import app.olauncher.helper.isPrivateSpaceProfile
 import app.olauncher.helper.isSystemApp
 import app.olauncher.helper.openAppInfo
 import app.olauncher.helper.openSearch
@@ -160,7 +160,7 @@ class AppDrawerFragment : Fragment() {
                         }
 
                     is AppModel.App -> {
-                        if (isPrivateSpaceProfile(requireContext(), appModel.user)) {
+                        if (appModel.user != Process.myUserHandle()) {
                             openAppInfo(requireContext(), appModel.user, appModel.appPackage)
                         } else if (requireContext().isSystemApp(appModel.appPackage, appModel.user)) {
                             requireContext().showToast(getString(R.string.system_app_cannot_delete))
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 52b186a..8378c24 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -131,6 +131,7 @@
     <string name="launcher_failed_to_lock_device">Olauncher failed to lock device.\nPlease check your app settings.</string>
     <string name="long_press_to_select_app">Long press to select app</string>
     <string name="unable_to_open_app">Unable to open app</string>
+    <string name="unable_to_open_app_info">Unable to open app info</string>
     <string name="copied">Copied</string>
     <string name="system_app_cannot_delete">System app, cannot delete</string>
     <string name="type_a_new_app_name_first">Type a new app name first</string>