app/src/main/java/sushi/hardcore/droidfs/adapters/IconTextDialogAdapter.kt

@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import sushi.hardcore.droidfs.R
 
 open class IconTextDialogAdapter(private val context: Context): BaseAdapter() {
@@ -19,7 +19,7 @@ open class IconTextDialogAdapter(private val context: Context): BaseAdapter() {
         val text = view.findViewById<TextView>(R.id.text)
         text.text = context.getString(items[position][1] as Int)
         val icon = view.findViewById<ImageView>(R.id.icon)
-        icon.setImageDrawable(ContextCompat.getDrawable(context, items[position][2] as Int))
+        icon.setImageDrawable(AppCompatResources.getDrawable(context, items[position][2] as Int))
         return view
     }
 

app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt

@@ -497,7 +497,7 @@ open class BaseExplorerActivity : BaseActivity(), ExplorerElementAdapter.Listene
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    protected fun handleMenuItems(menu: Menu){
         menu.findItem(R.id.rename).isVisible = false
         menu.findItem(R.id.open_as)?.isVisible = false
         if (usf_open){
@@ -522,7 +522,6 @@ open class BaseExplorerActivity : BaseActivity(), ExplorerElementAdapter.Listene
                 }
             }
         }
-        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt

@@ -258,12 +258,11 @@ 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
             }
@@ -286,7 +285,7 @@ class ExplorerActivity : BaseExplorerActivity() {
                 }
             }
         }
-        return result
+        return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

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)
-        val result = super.onCreateOptionsMenu(menu)
+        handleMenuItems(menu)
         menu.findItem(R.id.validate).isVisible = explorerAdapter.selectedItems.isEmpty()
-        return result
+        return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

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)
-        val result = super.onCreateOptionsMenu(menu)
+        handleMenuItems(menu)
         val anyItemSelected = explorerAdapter.selectedItems.isNotEmpty()
         menu.findItem(R.id.select_all).isVisible = anyItemSelected
         menu.findItem(R.id.validate).isVisible = anyItemSelected
-        return result
+        return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {