From c4e508813878a60fe431006bd1d11a1565399bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20F=C3=BClling?= <lukas@k40s.net>
Date: Mon, 9 Nov 2020 18:23:14 +0100
Subject: [PATCH] [#105] add 'manage storage' permission

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../lrkFM/activities/file/FileActivity.java   | 26 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a90bdbd5..74455041 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
diff --git a/app/src/main/java/io/lerk/lrkFM/activities/file/FileActivity.java b/app/src/main/java/io/lerk/lrkFM/activities/file/FileActivity.java
index 93ce4345..0ba840c1 100644
--- a/app/src/main/java/io/lerk/lrkFM/activities/file/FileActivity.java
+++ b/app/src/main/java/io/lerk/lrkFM/activities/file/FileActivity.java
@@ -19,6 +19,7 @@
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.browser.customtabs.CustomTabsIntent;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -123,6 +124,11 @@ public class FileActivity extends ThemedAppCompatActivity {
      */
     private static final int REQUEST_EXTERNAL_STORAGE = 1;
 
+    /**
+     * 0 if we have no permission.
+     */
+    private static final int REQUEST_MANAGE_STORAGE = 1;
+
     /**
      * The rootfs path ('/').
      */
@@ -143,6 +149,16 @@ public class FileActivity extends ThemedAppCompatActivity {
      */
     private static final String STATE_KEY_OP_CONTEXT_FILES = "state_current_op_files";
 
+    /**
+     * The permissions we need to do our job on Android R and higher.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    private static final String[] PERMISSIONS_STORAGE_R = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.MANAGE_EXTERNAL_STORAGE
+    };
+
     /**
      * The permissions we need to do our job.
      */
@@ -1242,8 +1258,14 @@ void newFile(File file) {
      * @param context the context
      */
     public static void verifyStoragePermissions(Activity context) {
-        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(context, PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.MANAGE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(context, PERMISSIONS_STORAGE_R, REQUEST_EXTERNAL_STORAGE);
+            }
+        } else {
+            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(context, PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
+            }
         }
     }