From 478524c49d62b508ecbc54dfcf7a9e71fe3d9795 Mon Sep 17 00:00:00 2001
From: ottoptj <ottop@ottop.eu>
Date: Sat, 31 Aug 2024 00:40:13 +0300
Subject: [PATCH] Fixed uninstall popup causing a return to home

---
 app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt | 1 +
 app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt  | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt b/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt
index 4ece7d7..c4aaa7f 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/AppActionMenu.kt
@@ -105,6 +105,7 @@ class AppActionMenu(private val activity: MainActivity, private val binding: Act
         intent.data = Uri.parse("package:${appInfo.packageName}")
         intent.putExtra(Intent.EXTRA_USER, userHandle)
         activity.startActivity(intent)
+        activity.returnAllowed = false
     }
 
     private fun renameApp(textView: TextView, editLayout: LinearLayout, actionMenu: View, appActivity: LauncherActivityInfo?, appInfo: ApplicationInfo, userHandle: UserHandle, workProfile: Int) {
diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
index 38606ae..f2590e5 100644
--- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
+++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
@@ -100,6 +100,8 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
     private lateinit var gestureDetector: GestureDetector
     private lateinit var shortcutGestureDetector: GestureDetector
 
+    var returnAllowed = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
@@ -721,13 +723,15 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
         super.onStart()
         // Keyboard is sometimes open when going back to the app, so close it.
         closeKeyboard()
-
     }
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onResume() {
         super.onResume()
-        backToHome(0)
+        if (returnAllowed) {
+            backToHome(0)
+        }
+        returnAllowed = true
         adapter?.notifyDataSetChanged()
     }