Fixed: App drawer closing while unlocking private space

2 files changed, 8 insertions, 0 deletions

diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt
index 1f081b2..9fd4790 100644
--- a/app/src/main/java/app/olauncher/MainActivity.kt
+++ b/app/src/main/java/app/olauncher/MainActivity.kt
@@ -112,6 +112,7 @@ class MainActivity : AppCompatActivity() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
             profileReceiver = object : BroadcastReceiver() {
                 override fun onReceive(context: Context?, intent: Intent?) {
+                    viewModel.isPrivateSpaceToggling = false
                     viewModel.getPrivateSpaceAppList()
                 }
             }
@@ -131,6 +132,7 @@ class MainActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
         isResumed = true
+        viewModel.isPrivateSpaceToggling = false
     }
 
     override fun onStop() {
@@ -324,6 +326,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun backToHomeScreen() {
+        if (viewModel.isPrivateSpaceToggling) return
         binding.messageLayout.visibility = View.GONE
         if (navController.currentDestination?.id != R.id.mainFragment)
             navController.popBackStack(R.id.mainFragment, false)
diff --git a/app/src/main/java/app/olauncher/MainViewModel.kt b/app/src/main/java/app/olauncher/MainViewModel.kt
index e513f7b..7196a7e 100644
--- a/app/src/main/java/app/olauncher/MainViewModel.kt
+++ b/app/src/main/java/app/olauncher/MainViewModel.kt
@@ -56,6 +56,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     val privateSpaceLocked = MutableLiveData<Boolean>()
     val privateSpaceAvailable = MutableLiveData<Boolean>()
 
+    // Suppress backToHomeScreen during Private Space lock/unlock auth
+    var isPrivateSpaceToggling = false
+
     val showDialog = SingleLiveEvent<String>()
     val checkForMessages = SingleLiveEvent<Unit?>()
     val resetLauncherLiveData = SingleLiveEvent<Unit?>()
@@ -489,10 +492,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) return
         val handle = getPrivateSpaceUserHandle(appContext) ?: return
         try {
+            isPrivateSpaceToggling = true
             val userManager = appContext.getSystemService(Context.USER_SERVICE) as UserManager
             val currentlyLocked = userManager.isQuietModeEnabled(handle)
             userManager.requestQuietModeEnabled(!currentlyLocked, handle)
         } catch (e: Exception) {
+            isPrivateSpaceToggling = false
             e.printStackTrace()
         }
     }