diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2abdd5d0b8f..cf5acbd59643 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,20 +17,6 @@
         android:name="android.hardware.camera2"
         android:required="false"
         tools:node="replace" />
-    <!--
- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
-        API >= 23; the app needs to handle this
-    -->
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29"
-        tools:ignore="ScopedStorage" />
-    <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE" /> <!-- Next permissions are always approved in installation time, the apps needs to do nothing special in runtime -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -52,11 +38,32 @@
  Apps that target Android 9 (API level 28) or higher and use foreground services
     must request the FOREGROUND_SERVICE permission
     -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Runtime permissions introduced in Android 13 (API level 33) -->
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <!-- Needed for Android 14 (API level 34) -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+
+    <!-- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in API >= 23; the app needs to handle this-->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
+
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
+
+    <!-- Devices running Android 12L (API level 32) or lower  -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+
+    <!-- Devices running Android 13 (API level 33) or higher -->
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+    <!-- To handle the reselection within the app on devices running Android 14
+     or higher if your app targets Android 14 (API level 34) or higher.  -->
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+
+
     <!--
  Some Chromebooks don't support touch. Although not essential,
          it's a good idea to explicitly include this declaration.
diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
index 16f6fb404980..2423a3105e7b 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
@@ -378,10 +378,6 @@ default void onDarkThemeModeChanged(DarkMode mode) {
 
     int getPdfZoomTipShownCount();
 
-    boolean isStoragePermissionRequested();
-
-    void setStoragePermissionRequested(boolean value);
-
     void setInAppReviewData(@NonNull AppReviewShownModel appReviewShownModel);
 
     @Nullable
diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
index 75d50b9b4a2e..7bd3cb17a6cf 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
@@ -100,7 +100,6 @@ public final class AppPreferencesImpl implements AppPreferences {
     private static final String PREF__PDF_ZOOM_TIP_SHOWN = "pdf_zoom_tip_shown";
     private static final String PREF__MEDIA_FOLDER_LAST_PATH = "media_folder_last_path";
 
-    private static final String PREF__STORAGE_PERMISSION_REQUESTED = "storage_permission_requested";
     private static final String PREF__IN_APP_REVIEW_DATA = "in_app_review_data";
 
     private static final String PREF__TWO_WAY_STATUS = "two_way_sync_status";
@@ -762,16 +761,6 @@ public int getPdfZoomTipShownCount() {
         return preferences.getInt(PREF__PDF_ZOOM_TIP_SHOWN, 0);
     }
 
-    @Override
-    public boolean isStoragePermissionRequested() {
-        return preferences.getBoolean(PREF__STORAGE_PERMISSION_REQUESTED, false);
-    }
-
-    @Override
-    public void setStoragePermissionRequested(boolean value) {
-        preferences.edit().putBoolean(PREF__STORAGE_PERMISSION_REQUESTED, value).apply();
-    }
-
     @VisibleForTesting
     public int computeBruteForceDelay(int count) {
         return (int) Math.min(count / 3d, 10);
diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java
index 2d9015e4e635..2041acc7a0bc 100644
--- a/app/src/main/java/com/owncloud/android/MainApp.java
+++ b/app/src/main/java/com/owncloud/android/MainApp.java
@@ -628,7 +628,7 @@ public static void initSyncOperations(
         updateAutoUploadEntries(clock);
 
         if (getAppContext() != null) {
-            if (PermissionUtil.checkExternalStoragePermission(getAppContext())) {
+            if (PermissionUtil.checkStoragePermission(getAppContext())) {
                 splitOutAutoUploadEntries(clock, viewThemeUtils);
             } else {
                 preferences.setAutoUploadSplitEntriesEnabled(true);
diff --git a/app/src/main/java/com/owncloud/android/datamodel/MediaProvider.java b/app/src/main/java/com/owncloud/android/datamodel/MediaProvider.java
index c3dd31c29290..1f8e18abefa8 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/MediaProvider.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/MediaProvider.java
@@ -66,7 +66,7 @@ public static List<MediaFolder> getImageFolders(ContentResolver contentResolver,
 
         // query media/image folders
         Cursor cursorFolders = null;
-        if (activity != null && PermissionUtil.checkExternalStoragePermission(activity.getApplicationContext())
+        if (activity != null && PermissionUtil.checkStoragePermission(activity.getApplicationContext())
             || getWithoutActivity) {
             cursorFolders = ContentResolverHelper.queryResolver(contentResolver, IMAGES_MEDIA_URI,
                                                                 IMAGES_FOLDER_PROJECTION, null, null,
@@ -161,9 +161,8 @@ private static boolean isValidAndExistingFilePath(String filePath) {
 
     private static void checkPermissions(@Nullable AppCompatActivity activity,
                                          final ViewThemeUtils viewThemeUtils) {
-        if (activity != null &&
-            !PermissionUtil.checkExternalStoragePermission(activity.getApplicationContext())) {
-            PermissionUtil.requestExternalStoragePermission(activity, viewThemeUtils, true);
+        if (activity != null) {
+            PermissionUtil.requestStoragePermissionIfNeeded(activity, viewThemeUtils, true);
         }
     }
 
@@ -177,7 +176,7 @@ public static List<MediaFolder> getVideoFolders(ContentResolver contentResolver,
 
         // query media/image folders
         Cursor cursorFolders = null;
-        if ((activity != null && PermissionUtil.checkExternalStoragePermission(activity.getApplicationContext()))
+        if ((activity != null && PermissionUtil.checkStoragePermission(activity.getApplicationContext()))
             || getWithoutActivity) {
             cursorFolders = contentResolver.query(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, VIDEOS_FOLDER_PROJECTION,
                                                   null, null, null);
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index fa125ec8fea2..9b23b9e52e1c 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -451,7 +451,7 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
                 if (dialog != null && dialog.isShowing()) {
                     dialog.dismiss();
                     getSupportFragmentManager().beginTransaction().remove(fragment).commitNowAllowingStateLoss();
-                    PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils);
+                    PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils);
                 }
             }
         }
@@ -467,7 +467,7 @@ protected void onPostCreate(Bundle savedInstanceState) {
             // storage permissions handled in onRequestPermissionsResult
             PermissionUtil.requestNotificationPermission(this);
         } else {
-            PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils);
+            PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils);
         }
 
         if (IntentExtensionsKt.getParcelableArgument(getIntent(), OCFileListFragment.SEARCH_EVENT, SearchEvent.class) != null) {
@@ -544,7 +544,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             case PermissionUtil.PERMISSIONS_POST_NOTIFICATIONS:
                 // handle notification permission on API level >= 33
                 // dialogue was dismissed -> prompt for storage permissions
-                PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils);
+                PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils);
                 break;
             case PermissionUtil.PERMISSIONS_EXTERNAL_STORAGE:
                 // If request is cancelled, result arrays are empty.
@@ -684,7 +684,7 @@ private void showReEnableAutoUploadDialog() {
             .setTitle(R.string.re_enable_auto_upload)
             .setMessage(R.string.re_enable_auto_upload_desc)
             .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
-                PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils);
+                PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils);
                 PermissionUtil.requestMediaLocationPermission(this);
                 preferences.setAutoUploadGPlayNotificationShown(true);
                 dialog.dismiss();
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
index d18c26825cb6..a7f4be18f7d2 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
@@ -191,7 +191,7 @@ class SyncedFoldersActivity :
             setTheme(R.style.FallbackThemingTheme)
         }
         binding.emptyList.emptyListViewAction.setOnClickListener { showHiddenItems() }
-        PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils, true)
+        PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils, true)
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -531,7 +531,7 @@ class SyncedFoldersActivity :
             android.R.id.home -> finish()
             R.id.action_create_custom_folder -> {
                 Log_OC.d(TAG, "Show custom folder dialog")
-                if (PermissionUtil.checkExternalStoragePermission(this)) {
+                if (PermissionUtil.checkStoragePermission(this)) {
                     val emptyCustomFolder = SyncedFolderDisplayItem(
                         SyncedFolder.UNPERSISTED_ID,
                         null,
@@ -554,7 +554,7 @@ class SyncedFoldersActivity :
                     )
                     onSyncFolderSettingsClick(0, emptyCustomFolder)
                 } else {
-                    PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils, true)
+                    PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils, true)
                 }
                 result = super.onOptionsItemSelected(item)
             }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 36b12acd7e68..37552f9c6c38 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -259,7 +259,7 @@ public void onNothingSelected(AdapterView<?> parent) {
     }
 
     private void requestPermissions() {
-        PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils, true);
+        PermissionUtil.requestStoragePermissionIfNeeded(this, viewThemeUtils, true);
     }
 
     public void showToolbarSpinner() {
@@ -319,7 +319,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void checkLocalStoragePathPickerPermission() {
-        if (!PermissionUtil.checkExternalStoragePermission(this)) {
+        if (!PermissionUtil.checkStoragePermission(this)) {
             requestPermissions();
         } else {
             showLocalStoragePathPickerDialog();
@@ -628,7 +628,7 @@ public void onClick(View v) {
             finish();
 
         } else if (v.getId() == R.id.upload_files_btn_upload) {
-            if (PermissionUtil.checkExternalStoragePermission(this)) {
+            if (PermissionUtil.checkStoragePermission(this)) {
                 if (mCurrentDir != null) {
                     preferences.setUploadFromLocalLastPath(mCurrentDir.getAbsolutePath());
                 }
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/StoragePermissionDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/StoragePermissionDialogFragment.kt
index 220f28edd680..9a935168fbd2 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/StoragePermissionDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/StoragePermissionDialogFragment.kt
@@ -10,7 +10,6 @@ package com.owncloud.android.ui.dialog
 import android.app.Dialog
 import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
@@ -19,19 +18,15 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.nextcloud.client.di.Injectable
 import com.owncloud.android.R
+import com.owncloud.android.utils.PermissionUtil
+import com.owncloud.android.utils.PermissionUtil.REQUEST_CODE_MANAGE_ALL_FILES
 import com.owncloud.android.utils.theme.ViewThemeUtils
-import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
-/**
- * Dialog that shows permission options in SDK >= 30
- *
- * Allows choosing "full access" (MANAGE_ALL_FILES) or "read-only media" (READ_EXTERNAL_STORAGE)
- */
 @RequiresApi(Build.VERSION_CODES.R)
 class StoragePermissionDialogFragment : DialogFragment(), Injectable {
 
-    private var permissionRequired = false
+    private var showStrictText = false
 
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
@@ -39,7 +34,7 @@ class StoragePermissionDialogFragment : DialogFragment(), Injectable {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
-            permissionRequired = it.getBoolean(ARG_PERMISSION_REQUIRED, false)
+            showStrictText = it.getBoolean(ARG_SHOW_STRICT_TEXT, false)
         }
     }
 
@@ -61,11 +56,11 @@ class StoragePermissionDialogFragment : DialogFragment(), Injectable {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val title = when {
-            permissionRequired -> R.string.file_management_permission
+            showStrictText -> R.string.file_management_permission
             else -> R.string.file_management_permission_optional
         }
         val explanationResource = when {
-            permissionRequired -> R.string.file_management_permission_text
+            showStrictText -> R.string.file_management_permission_text
             else -> R.string.file_management_permission_optional_text
         }
         val message = getString(explanationResource, getString(R.string.app_name))
@@ -74,15 +69,14 @@ class StoragePermissionDialogFragment : DialogFragment(), Injectable {
             .setTitle(title)
             .setMessage(message)
             .setPositiveButton(R.string.storage_permission_full_access) { _, _ ->
-                setResult(Result.FULL_ACCESS)
+                requestManageAllFiles()
                 dismiss()
             }
             .setNegativeButton(R.string.storage_permission_media_read_only) { _, _ ->
-                setResult(Result.MEDIA_READ_ONLY)
+                requestMediaReadOnly()
                 dismiss()
             }
             .setNeutralButton(R.string.common_cancel) { _, _ ->
-                setResult(Result.CANCEL)
                 dismiss()
             }
 
@@ -91,29 +85,33 @@ class StoragePermissionDialogFragment : DialogFragment(), Injectable {
         return dialogBuilder.create()
     }
 
-    private fun setResult(result: Result) {
-        parentFragmentManager.setFragmentResult(REQUEST_KEY, bundleOf(RESULT_KEY to result))
+    @Suppress("DEPRECATION")
+    private fun requestManageAllFiles() {
+        activity?.let {
+            val intent = PermissionUtil.getManageAllFilesIntent(it)
+            it.startActivityForResult(intent, REQUEST_CODE_MANAGE_ALL_FILES)
+        }
     }
 
-    @Parcelize
-    enum class Result : Parcelable {
-        CANCEL,
-        FULL_ACCESS,
-        MEDIA_READ_ONLY
+    private fun requestMediaReadOnly() {
+        activity?.let {
+            PermissionUtil.showStoragePermissionsSnackbarOrRequest(
+                activity = it,
+                viewThemeUtils = viewThemeUtils
+            )
+        }
     }
 
     companion object {
-        private const val ARG_PERMISSION_REQUIRED = "ARG_PERMISSION_REQUIRED"
-        const val REQUEST_KEY = "REQUEST_KEY_STORAGE_PERMISSION"
-        const val RESULT_KEY = "RESULT"
+        private const val ARG_SHOW_STRICT_TEXT = "ARG_SHOW_STRICT_TEXT"
 
         /**
-         * @param permissionRequired Whether the permission is absolutely required by the calling component.
+         * @param showStrictText Whether the permission is absolutely required by the calling component.
          * This changes the texts to a more strict version.
          */
-        fun newInstance(permissionRequired: Boolean): StoragePermissionDialogFragment {
+        fun newInstance(showStrictText: Boolean): StoragePermissionDialogFragment {
             return StoragePermissionDialogFragment().apply {
-                arguments = bundleOf(ARG_PERMISSION_REQUIRED to permissionRequired)
+                arguments = bundleOf(ARG_SHOW_STRICT_TEXT to showStrictText)
             }
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
index f3aecc908b7e..5b21b2a72424 100644
--- a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
+++ b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
@@ -16,7 +16,6 @@ import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.net.Uri
 import android.os.Build
-import android.os.Bundle
 import android.os.Environment
 import android.provider.Settings
 import androidx.annotation.RequiresApi
@@ -24,14 +23,15 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.google.android.material.snackbar.Snackbar
-import com.nextcloud.client.preferences.AppPreferences
-import com.nextcloud.client.preferences.AppPreferencesImpl
-import com.nextcloud.utils.extensions.getParcelableArgument
 import com.owncloud.android.R
+import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.dialog.StoragePermissionDialogFragment
 import com.owncloud.android.utils.theme.ViewThemeUtils
 
+@Suppress("TooManyFunctions")
 object PermissionUtil {
+    private const val TAG = "PermissionUtil"
+
     const val PERMISSIONS_EXTERNAL_STORAGE = 1
     const val PERMISSIONS_READ_CONTACTS_AUTOMATIC = 2
     const val PERMISSIONS_WRITE_CONTACTS = 4
@@ -72,7 +72,7 @@ object PermissionUtil {
         ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)
 
     /**
-     * Determine whether the app has been granted external storage permissions depending on SDK.
+     * Determine whether the app has been granted storage permissions depending on SDK.
      *
      * For sdk >= 30 we use the storage manager special permission for full access, or READ_EXTERNAL_STORAGE
      * for limited access
@@ -82,7 +82,7 @@ object PermissionUtil {
      * @return `true` if app has the permission, or `false` if not.
      */
     @JvmStatic
-    fun checkExternalStoragePermission(context: Context): Boolean = when {
+    fun checkStoragePermission(context: Context): Boolean = when {
         Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> Environment.isExternalStorageManager() ||
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 checkSelfPermission(context, Manifest.permission.READ_MEDIA_IMAGES) || checkSelfPermission(
@@ -101,99 +101,81 @@ object PermissionUtil {
     }
 
     /**
-     * Request relevant external storage permission depending on SDK, if needed.
+     * Request relevant storage permission depending on SDK, if needed.
      *
      * Activities should implement [Activity.onRequestPermissionsResult]
      * and handle the [PERMISSIONS_EXTERNAL_STORAGE] code, as well as [Activity.onActivityResult]
      * with `requestCode=`[REQUEST_CODE_MANAGE_ALL_FILES]
      *
-     * @param activity The target activity.
-     * @param permissionRequired for SDK >=30 specifically, show again even if already denied in the past
      */
     @JvmStatic
     @JvmOverloads
-    fun requestExternalStoragePermission(
+    fun requestStoragePermissionIfNeeded(
         activity: AppCompatActivity,
         viewThemeUtils: ViewThemeUtils,
-        permissionRequired: Boolean = false
+        showStrictText: Boolean = false
     ) {
-        if (!checkExternalStoragePermission(activity)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && canRequestAllFilesPermission(activity)) {
-                // can request All Files, show choice
-                showPermissionChoiceDialog(activity, permissionRequired, viewThemeUtils)
-            } else {
-                // can not request all files, request read-only access
-                requestStoragePermission(
-                    activity,
-                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.R,
-                    permissionRequired,
-                    viewThemeUtils
-                )
-            }
+        if (checkStoragePermission(activity)) {
+            Log_OC.d(TAG, "Storage permissions are already granted")
+            return
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && canRequestAllFilesPermission(activity)) {
+            showStoragePermissionDialogFragment(activity, showStrictText)
+        } else {
+            showStoragePermissionsSnackbarOrRequest(
+                activity,
+                viewThemeUtils
+            )
         }
     }
 
-    /**
-     * Request a storage permission
-     */
-    // TODO inject this class to avoid passing ViewThemeUtils around
-    @Suppress("NestedBlockDepth")
-    private fun requestStoragePermission(
-        activity: Activity,
-        readOnly: Boolean,
-        permissionRequired: Boolean,
-        viewThemeUtils: ViewThemeUtils
-    ) {
-        val preferences: AppPreferences = AppPreferencesImpl.fromContext(activity)
+    fun showStoragePermissionsSnackbarOrRequest(activity: Activity, viewThemeUtils: ViewThemeUtils) {
+        val permissions = getStoragePermissions()
 
-        if (permissionRequired || !preferences.isStoragePermissionRequested) {
-            // determine required permissions
-            val permissions = if (readOnly && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    // use granular media permissions
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                        arrayOf(
-                            Manifest.permission.READ_MEDIA_IMAGES,
-                            Manifest.permission.READ_MEDIA_VIDEO,
-                            Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-                        )
-                    } else {
-                        arrayOf(
-                            Manifest.permission.READ_MEDIA_IMAGES,
-                            Manifest.permission.READ_MEDIA_VIDEO
-                        )
-                    }
-                } else {
-                    arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
-                }
-            } else {
-                arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            }
+        if (permissions.any { shouldShowRequestPermissionRationale(activity, it) }) {
+            showStoragePermissionsSnackbar(activity, permissions, viewThemeUtils)
+        } else {
+            requestPermissions(activity, permissions)
+        }
+    }
 
-            fun doRequest() {
-                ActivityCompat.requestPermissions(
-                    activity,
-                    permissions,
-                    PERMISSIONS_EXTERNAL_STORAGE
-                )
-                preferences.isStoragePermissionRequested = true
-            }
+    private fun getStoragePermissions() = when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> arrayOf(
+            Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED,
+            Manifest.permission.READ_MEDIA_IMAGES,
+            Manifest.permission.READ_MEDIA_VIDEO
+        )
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> arrayOf(
+            Manifest.permission.READ_MEDIA_IMAGES,
+            Manifest.permission.READ_MEDIA_VIDEO
+        )
+        else -> arrayOf(
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_EXTERNAL_STORAGE
+        )
+    }
 
-            // Check if we should show an explanation
-            if (permissions.any { shouldShowRequestPermissionRationale(activity, it) }) {
-                // Show explanation to the user and then request permission
-                Snackbar.make(
-                    activity.findViewById(android.R.id.content),
-                    R.string.permission_storage_access,
-                    Snackbar.LENGTH_INDEFINITE
-                ).setAction(R.string.common_ok) {
-                    doRequest()
-                }.also { viewThemeUtils.material.themeSnackbar(it) }.show()
-            } else {
-                // No explanation needed, request the permission.
-                doRequest()
-            }
-        }
+    private fun requestPermissions(activity: Activity, permissions: Array<String>) {
+        ActivityCompat.requestPermissions(
+            activity,
+            permissions,
+            PERMISSIONS_EXTERNAL_STORAGE
+        )
+    }
+
+    private fun showStoragePermissionsSnackbar(
+        activity: Activity,
+        permissions: Array<String>,
+        viewThemeUtils: ViewThemeUtils
+    ) {
+        Snackbar.make(
+            activity.findViewById(android.R.id.content),
+            R.string.permission_storage_access,
+            Snackbar.LENGTH_INDEFINITE
+        ).setAction(R.string.common_ok) {
+            requestPermissions(activity, permissions)
+        }.also { viewThemeUtils.material.themeSnackbar(it) }.show()
     }
 
     @RequiresApi(Build.VERSION_CODES.R)
@@ -215,67 +197,21 @@ object PermissionUtil {
         return packageInfo?.requestedPermissions?.contains(Manifest.permission.MANAGE_EXTERNAL_STORAGE) ?: false
     }
 
-    /**
-     * sdk >= 30: Choice between All Files access or read_external_storage
-     */
     @RequiresApi(Build.VERSION_CODES.R)
-    private fun showPermissionChoiceDialog(
-        activity: AppCompatActivity,
-        permissionRequired: Boolean,
-        viewThemeUtils: ViewThemeUtils
-    ) {
-        val preferences: AppPreferences = AppPreferencesImpl.fromContext(activity)
-        val shouldRequestPermission = !preferences.isStoragePermissionRequested || permissionRequired
-        if (shouldRequestPermission &&
-            activity.supportFragmentManager.findFragmentByTag(PERMISSION_CHOICE_DIALOG_TAG) == null
-        ) {
-            val listener: (requestKey: String, result: Bundle) -> Unit = { _, resultBundle ->
-                val result: StoragePermissionDialogFragment.Result? =
-                    resultBundle.getParcelableArgument(
-                        StoragePermissionDialogFragment.RESULT_KEY,
-                        StoragePermissionDialogFragment.Result::class.java
-                    )
-                if (result != null) {
-                    preferences.isStoragePermissionRequested = true
-                    when (result) {
-                        StoragePermissionDialogFragment.Result.FULL_ACCESS -> {
-                            val intent = getManageAllFilesIntent(activity)
-                            activity.startActivityForResult(intent, REQUEST_CODE_MANAGE_ALL_FILES)
-                        }
-
-                        StoragePermissionDialogFragment.Result.MEDIA_READ_ONLY -> requestStoragePermission(
-                            activity = activity,
-                            readOnly = true,
-                            permissionRequired = true,
-                            viewThemeUtils = viewThemeUtils
-                        )
-
-                        else -> {}
-                    }
-                }
-            }
-
-            activity.runOnUiThread {
-                activity.supportFragmentManager.setFragmentResultListener(
-                    StoragePermissionDialogFragment.REQUEST_KEY,
-                    activity,
-                    listener
-                )
-
-                // Check if the dialog is already added to the FragmentManager.
-                val existingDialog = activity.supportFragmentManager.findFragmentByTag(PERMISSION_CHOICE_DIALOG_TAG)
+    private fun showStoragePermissionDialogFragment(activity: AppCompatActivity, showStrictText: Boolean) {
+        activity.runOnUiThread {
+            val existingDialog = activity.supportFragmentManager.findFragmentByTag(PERMISSION_CHOICE_DIALOG_TAG)
 
-                // Only show the dialog if it's not already shown.
-                if (existingDialog == null) {
-                    val dialogFragment = StoragePermissionDialogFragment.newInstance(permissionRequired)
-                    dialogFragment.show(activity.supportFragmentManager, PERMISSION_CHOICE_DIALOG_TAG)
+            if (existingDialog == null) {
+                StoragePermissionDialogFragment.newInstance(showStrictText).run {
+                    show(activity.supportFragmentManager, PERMISSION_CHOICE_DIALOG_TAG)
                 }
             }
         }
     }
 
     @RequiresApi(Build.VERSION_CODES.R)
-    private fun getManageAllFilesIntent(context: Context) = Intent().apply {
+    fun getManageAllFilesIntent(context: Context) = Intent().apply {
         action = Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
         data = Uri.parse("package:${context.applicationContext.packageName}")
     }