Add description for storage permission

fython · fython · commit fde48bf9f094 · 2019-04-25T22:42:44.000+08:00
Signed-off-by: Fung Gwo &lt;fython@163.com&gt;
diff --git a/app/src/main/java/app/gwo/safenhancer/lite/SettingsActivity.java b/app/src/main/java/app/gwo/safenhancer/lite/SettingsActivity.java
@@ -19,6 +19,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import app.gwo.safenhancer.lite.compat.Optional;
 import app.gwo.safenhancer.lite.util.BuildUtils;
 import app.gwo.safenhancer.lite.util.Settings;
@@ -32,16 +34,6 @@ public final class SettingsActivity extends BaseActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                requestPermissions(new String[] {
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                }, 0);
-            }
-        }
-
         if (savedInstanceState == null) {
             getFragmentManager()
                     .beginTransaction()
@@ -52,6 +44,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
     public static final class SettingsFragment extends PreferenceFragment {
 
+        private static final String KEY_STORAGE_PERMISSION = "storage_permission";
         private static final String KEY_PREFERRED_CAMERA_CLEAR = "clear_preferred_camera";
         private static final String KEY_HANDLED_APPS_CHOOSE = "handled_apps_choose";
         private static final String KEY_ABOUT_VERSION = "version";
@@ -61,7 +54,10 @@ public static final class SettingsFragment extends PreferenceFragment {
 
         private static final int REQUEST_CODE_SR_PERMISSION = 1;
         private static final int REQUEST_CODE_OPEN_ROOT_URI = 2;
+        private static final int REQUEST_CODE_STORAGE_PERMISSION = 3;
 
+        @Nullable
+        private Preference mStoragePermission;
         private Preference mHandledAppsChoose;
         private SwitchPreference mSRPermission;
         private SwitchPreference mQIsolatedSupport;
@@ -73,6 +69,26 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             addPreferencesFromResource(R.xml.settings_screen);
             PackageManager pm = getActivity().getPackageManager();
 
+            mStoragePermission = findPreference(KEY_STORAGE_PERMISSION);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (getActivity().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                        == PackageManager.PERMISSION_GRANTED) {
+                    if (mStoragePermission != null) {
+                        getPreferenceScreen().removePreference(mStoragePermission);
+                    }
+                } else {
+                    startRequestStoragePermission();
+                }
+            }
+            if (mStoragePermission != null) {
+                mStoragePermission.setOnPreferenceClickListener(pref -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        startRequestStoragePermission();
+                    }
+                    return true;
+                });
+            }
+
             findPreference(KEY_PREFERRED_CAMERA_CLEAR).setOnPreferenceClickListener(p -> {
                 Settings.getInstance().setPreferredCamera(null);
                 Toast.makeText(getActivity(), R.string.toast_cleared, Toast.LENGTH_LONG).show();
@@ -94,9 +110,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
                 boolean newBool = (boolean) newValue;
                 if (newBool) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        requestPermissions(new String[] {
-                                StorageRedirectManager.PERMISSION
-                        }, REQUEST_CODE_SR_PERMISSION);
+                        startRequestSRPermission();
                     }
                 } else {
                     try {
@@ -177,6 +191,21 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             });
         }
 
+        @RequiresApi(api = Build.VERSION_CODES.M)
+        private void startRequestStoragePermission() {
+            requestPermissions(new String[] {
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+            }, REQUEST_CODE_STORAGE_PERMISSION);
+        }
+
+        @RequiresApi(api = Build.VERSION_CODES.M)
+        private void startRequestSRPermission() {
+            requestPermissions(new String[] {
+                    StorageRedirectManager.PERMISSION
+            }, REQUEST_CODE_SR_PERMISSION);
+        }
+
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             if (REQUEST_CODE_PACKAGES_SELECTOR == requestCode
@@ -228,6 +257,20 @@ public void onRequestPermissionsResult(int requestCode,
                         grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     mSRPermission.setChecked(true);
                 }
+            } else if (REQUEST_CODE_STORAGE_PERMISSION == requestCode) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    if (mStoragePermission != null) {
+                        getPreferenceScreen().removePreference(mStoragePermission);
+                    }
+                } else {
+                    if (!isDetached()) {
+                        new AlertDialog.Builder(getActivity())
+                                .setTitle(R.string.storage_permission_dialog_failed_title)
+                                .setMessage(R.string.storage_permission_dialog_failed_message)
+                                .setPositiveButton(android.R.string.ok, null)
+                                .show();
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -24,13 +24,13 @@ If they use their own interface only, it will have no effect even if apps are ch
     <string name="action_done">Done</string>
     <string name="packages_selector_search_hint">Search title/package name…</string>
 
-    <string name="isolated_storage_support_title">Isolated storage support</string>
+    <string name="isolated_storage_support_title">Isolated (Scoped) storage support</string>
     <string name="isolated_storage_support_for_sr">Enable "Storage Redirect" support</string>
     <string name="isolated_storage_support_for_sr_summary"><![CDATA[
 If apps handled by SAFEnhancer is controlled by Storage Redirect and you cannot choose images
 normally, you need enable this feature.
     ]]></string>
-    <string name="isolated_storage_support_for_q">Enable Stock Isolated storage support</string>
+    <string name="isolated_storage_support_for_q">Enable Stock Scoped storage support</string>
     <string name="isolated_storage_support_for_q_summary_disabled"><![CDATA[
 This feature is enabled for Android Q+ devices only.
     ]]></string>
@@ -58,4 +58,16 @@ Now we will open Documents UI to pick root storage. Please be sure to choose the
 https://github.com/fython-tools/DocUIProxy-Android
     ]]></string>
 
+    <string name="storage_permission_pref_title">Storage permission required</string>
+    <string name="storage_permission_pref_summary"><![CDATA[
+If you see this option, it means you haven\'t grant storage permission to SAF Enhancer Lite.
+For Android pre-Q users, you should click this option to request permission. For Android Q+ users,
+please enable Stock Scoped storage support.
+    ]]></string>
+    <string name="storage_permission_dialog_failed_title">Storage permission required</string>
+    <string name="storage_permission_dialog_failed_message"><![CDATA[
+Permission request was denied. SAF Enhancer Lite may not work properly without storage permission
+before Android Q.
+    ]]></string>
+
 </resources>
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
@@ -2,6 +2,10 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <Preference android:key="storage_permission"
+        android:title="@string/storage_permission_pref_title"
+        android:summary="@string/storage_permission_pref_summary"/>
+
     <PreferenceCategory android:title="@string/handled_apps">
 
         <Preference android:key="handled_apps_choose"
