From c8d266150c67020282df70796e8d567d40f031c6 Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Sun, 1 May 2022 13:50:37 +0200
Subject: [PATCH] Fix explorer menu display

---
 .../sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt | 3 ++-
 .../sushi/hardcore/droidfs/explorers/ExplorerActivity.kt     | 5 +++--
 .../sushi/hardcore/droidfs/explorers/ExplorerActivityDrop.kt | 4 ++--
 .../sushi/hardcore/droidfs/explorers/ExplorerActivityPick.kt | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
index 0940be2..eba643e 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
@@ -497,7 +497,7 @@ open class BaseExplorerActivity : BaseActivity(), ExplorerElementAdapter.Listene
         }
     }
 
-    protected fun handleMenuItems(menu: Menu){
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menu.findItem(R.id.rename).isVisible = false
         menu.findItem(R.id.open_as)?.isVisible = false
         if (usf_open){
@@ -522,6 +522,7 @@ open class BaseExplorerActivity : BaseActivity(), ExplorerElementAdapter.Listene
                 }
             }
         }
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt
index d52447d..465f299 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt
@@ -258,11 +258,12 @@ class ExplorerActivity : BaseExplorerActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.explorer, menu)
+        val result = super.onCreateOptionsMenu(menu)
         if (currentItemAction != ItemsActions.NONE) {
             menu.findItem(R.id.validate).isVisible = true
             menu.findItem(R.id.close).isVisible = false
+            supportActionBar?.setDisplayHomeAsUpEnabled(true)
         } else {
-            handleMenuItems(menu)
             if (usf_share){
                 menu.findItem(R.id.share).isVisible = false
             }
@@ -285,7 +286,7 @@ class ExplorerActivity : BaseExplorerActivity() {
                 }
             }
         }
-        return true
+        return result
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityDrop.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityDrop.kt
index d3a7927..ef38b2d 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityDrop.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityDrop.kt
@@ -21,9 +21,9 @@ class ExplorerActivityDrop : BaseExplorerActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.explorer_drop, menu)
-        handleMenuItems(menu)
+        val result = super.onCreateOptionsMenu(menu)
         menu.findItem(R.id.validate).isVisible = explorerAdapter.selectedItems.isEmpty()
-        return true
+        return result
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityPick.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityPick.kt
index f381529..3f332bd 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityPick.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivityPick.kt
@@ -45,11 +45,11 @@ class ExplorerActivityPick : BaseExplorerActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.explorer_pick, menu)
-        handleMenuItems(menu)
+        val result = super.onCreateOptionsMenu(menu)
         val anyItemSelected = explorerAdapter.selectedItems.isNotEmpty()
         menu.findItem(R.id.select_all).isVisible = anyItemSelected
         menu.findItem(R.id.validate).isVisible = anyItemSelected
-        return true
+        return result
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {