From 50134a2f9b01538293b9694f0e586ffbdef02e22 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Thu, 2 May 2019 16:03:56 +0200
Subject: [PATCH] Fixed backpress not working

---
 .../main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
index 71f66a7ff..22290629a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskActivity.kt
@@ -44,6 +44,9 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
         FragNavController(supportFragmentManager, navHostId)
     }
 
+    private val isRootFragment
+        get() = navigationController?.let { it.currentStackIndex != defaultPosition } ?: false
+
     init {
         val isDarkTheme = Config.get<Boolean>(Config.Key.DARK_THEME)
         val theme = if (isDarkTheme) {
@@ -148,7 +151,7 @@ abstract class MagiskActivity<ViewModel : MagiskViewModel, Binding : ViewDataBin
             navigationController?.popFragment() ?: throw UnsupportedOperationException()
         } catch (e: UnsupportedOperationException) {
             when {
-                navigationController?.currentStackIndex != defaultPosition -> {
+                isRootFragment -> {
                     val options = FragNavTransactionOptions.newBuilder()
                         .transition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
                         .build()