Merge pull request #9 from ath0mas/can-have-permission

Android: restore getWritePermission, but check can have permission

Author: ath0mas

src/android/FileUtils.java

@@ -533,7 +533,7 @@ public void run(JSONArray args) throws FileNotFoundException, JSONException, Mal
 
     private void getReadPermission(String rawArgs, int action, CallbackContext callbackContext) {
         int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext);
-        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             PermissionHelper.requestPermissions(this, requestCode,
                     new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VIDEO, Manifest.permission.READ_MEDIA_AUDIO});
         } else {
@@ -542,10 +542,8 @@ private void getReadPermission(String rawArgs, int action, CallbackContext callb
     }
 
     private void getWritePermission(String rawArgs, int action, CallbackContext callbackContext) {
-        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext);
-            PermissionHelper.requestPermission(this, requestCode, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-        }
+        int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext);
+        PermissionHelper.requestPermission(this, requestCode, Manifest.permission.WRITE_EXTERNAL_STORAGE);
     }
 
     /**
@@ -558,7 +556,7 @@ private void getWritePermission(String rawArgs, int action, CallbackContext call
      * @return
      */
     private boolean hasReadPermission() {
-        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             return PermissionHelper.hasPermission(this, Manifest.permission.READ_MEDIA_IMAGES)
                     && PermissionHelper.hasPermission(this, Manifest.permission.READ_MEDIA_VIDEO)
                     && PermissionHelper.hasPermission(this, Manifest.permission.READ_MEDIA_AUDIO);
@@ -567,11 +565,21 @@ private boolean hasReadPermission() {
         }
     }
 
+    private boolean canHaveReadPermission() {
+        return true;
+    }
+
+    /**
+     * Starting with API 33, requesting WRITE_EXTERNAL_STORAGE is an auto permission rejection.
+     *
+     * @return
+     */
     private boolean hasWritePermission() {
-        // Starting with API 33, requesting WRITE_EXTERNAL_STORAGE is an auto permission rejection
-        return android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-                ? true
-                : PermissionHelper.hasPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        return PermissionHelper.hasPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+    }
+
+    private boolean canHaveWritePermission() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU;
     }
 
     private boolean needPermission(String nativeURL, int permissionType) throws JSONException {
@@ -598,9 +606,9 @@ private boolean needPermission(String nativeURL, int permissionType) throws JSON
             allowedStorageDirectories.add(j.getString("externalMediaDirectory"));
         }
 
-        if (permissionType == READ && hasReadPermission()) {
+        if (permissionType == READ && (!canHaveReadPermission() || hasReadPermission())) {
             return false;
-        } else if (permissionType == WRITE && hasWritePermission()) {
+        } else if (permissionType == WRITE && (!canHaveWritePermission() || hasWritePermission())) {
             return false;
         }