Changes per PR feedback #2

- Fix top right menu Open in Terminal not working
- Fix permission granting sequence with PermissionsActivity

Author: TranceLove

app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java

@@ -115,6 +115,7 @@
 import com.amaze.filemanager.ui.dialogs.GeneralDialogCreation;
 import com.amaze.filemanager.ui.dialogs.HiddenFilesDialog;
 import com.amaze.filemanager.ui.dialogs.HistoryDialog;
+import com.amaze.filemanager.ui.dialogs.OpenFolderInTerminalFragment;
 import com.amaze.filemanager.ui.dialogs.RenameBookmark;
 import com.amaze.filemanager.ui.dialogs.RenameBookmark.BookmarkCallback;
 import com.amaze.filemanager.ui.dialogs.SftpConnectDialog;
@@ -1285,7 +1286,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
           } else if (item.getItemId() == R.id.search) {
             getAppbar().getSearchView().revealSearchView();
           } else if (item.getItemId() == R.id.open_in_terminal) {
-            // do nothing
+            OpenFolderInTerminalFragment.Companion.openTerminalOrShow(
+                mainFragment.getCurrentPath(), this);
           }
           return null;
         },

app/src/main/java/com/amaze/filemanager/ui/activities/superclasses/PermissionsActivity.kt

@@ -39,6 +39,7 @@ import com.afollestad.materialdialogs.MaterialDialog
 import com.amaze.filemanager.R
 import com.amaze.filemanager.application.AppConfig
 import com.amaze.filemanager.ui.dialogs.GeneralDialogCreation
+import com.amaze.filemanager.ui.dialogs.OpenFolderInTerminalFragment.Companion.TERMINAL_PERMISSIONS
 import com.amaze.filemanager.utils.Utils
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
@@ -265,8 +266,9 @@ open class PermissionsActivity :
         isInitialStart: Boolean,
     ) {
         permissionCallbacks[code] = onPermissionGranted
-
-        if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {
+        if (TERMINAL_PERMISSIONS.contains(permission) ||
+            ActivityCompat.shouldShowRequestPermissionRationale(this, permission)
+        ) {
             rationale
                 .getActionButton(DialogAction.POSITIVE)
                 .setOnClickListener { v: View? ->

app/src/main/java/com/amaze/filemanager/ui/dialogs/OpenFolderInTerminalFragment.kt

@@ -53,6 +53,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
 import com.bumptech.glide.util.ViewPreloadSizeProvider
 import org.slf4j.LoggerFactory
+import androidx.core.content.edit
 
 /**
  * Bottom sheet fragment for open folder in terminal app actions.
@@ -71,6 +72,7 @@ class OpenFolderInTerminalFragment : BaseBottomSheetFragment(), AdjustListViewFo
     private lateinit var sharedPreferences: SharedPreferences
 
     companion object {
+        @JvmStatic
         private val logger = LoggerFactory.getLogger(OpenFileDialogFragment::class.java)
 
         const val KEY_PREFERENCES_DEFAULT = "terminal._DEFAULT"
@@ -80,6 +82,14 @@ class OpenFolderInTerminalFragment : BaseBottomSheetFragment(), AdjustListViewFo
         private const val ANDROID_TERM_PERMISSION = "jackpal.androidterm.permission.RUN_SCRIPT"
         private const val TERMUX_PERMISSION = "com.termux.permission.RUN_COMMAND"
 
+        @JvmStatic
+        val TERMINAL_PERMISSIONS =
+            arrayOf(
+                TERMONE_PLUS_PERMISSION,
+                ANDROID_TERM_PERMISSION,
+                TERMUX_PERMISSION,
+            )
+
         @SuppressLint("SdCardPath")
         private const val TERMUX_SHELL_LOCATION = "/data/data/com.termux/files/usr/bin/bash"
 
@@ -196,10 +206,12 @@ class OpenFolderInTerminalFragment : BaseBottomSheetFragment(), AdjustListViewFo
             appDataParcelable: AppDataParcelable,
             sharedPreferences: SharedPreferences,
         ) {
-            sharedPreferences.edit().putString(
-                KEY_PREFERENCES_LAST,
-                appDataParcelable.packageName,
-            ).apply()
+            sharedPreferences.edit {
+                putString(
+                    KEY_PREFERENCES_LAST,
+                    appDataParcelable.packageName,
+                )
+            }
         }
 
         /**
@@ -209,10 +221,12 @@ class OpenFolderInTerminalFragment : BaseBottomSheetFragment(), AdjustListViewFo
             appDataParcelable: AppDataParcelable,
             sharedPreferences: SharedPreferences,
         ) {
-            sharedPreferences.edit().putString(
-                KEY_PREFERENCES_DEFAULT,
-                appDataParcelable.packageName,
-            ).apply()
+            sharedPreferences.edit {
+                putString(
+                    KEY_PREFERENCES_DEFAULT,
+                    appDataParcelable.packageName,
+                )
+            }
         }
 
         /**
@@ -221,7 +235,7 @@ class OpenFolderInTerminalFragment : BaseBottomSheetFragment(), AdjustListViewFo
         fun clearPreferences(sharedPreferences: SharedPreferences) {
             AppConfig.getInstance().runInBackground {
                 arrayOf(KEY_PREFERENCES_DEFAULT, KEY_PREFERENCES_LAST).forEach {
-                    sharedPreferences.edit().remove(it).apply()
+                    sharedPreferences.edit { remove(it) }
                 }
             }
         }