From 9c999f4685acb1744358fc0f45abbbbb0b66ea92 Mon Sep 17 00:00:00 2001 From: EYALIN Date: Tue, 11 Jul 2023 10:57:36 +0300 Subject: [PATCH 1/2] fix Android 13 write permissions in Android 13 we don't need to ask for permissions --- src/android/FileUtils.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/android/FileUtils.java b/src/android/FileUtils.java index de973da8..c71dc77a 100644 --- a/src/android/FileUtils.java +++ b/src/android/FileUtils.java @@ -599,8 +599,11 @@ private void getReadPermission(String rawArgs, int action, CallbackContext callb } private void getWritePermission(String rawArgs, int action, CallbackContext callbackContext) { - int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext); + int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext); + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + } else { PermissionHelper.requestPermission(this, requestCode, Manifest.permission.WRITE_EXTERNAL_STORAGE); + } } private boolean hasReadPermission() { @@ -614,7 +617,11 @@ private boolean hasReadPermission() { } private boolean hasWritePermission() { - return PermissionHelper.hasPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE); + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + return true; + } else { + return PermissionHelper.hasPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE); + } } private boolean needPermission(String nativeURL, int permissionType) throws JSONException { From 29f95b8ea91f1719b351b9ec6a43673c7ed909f3 Mon Sep 17 00:00:00 2001 From: EYALIN Date: Fri, 18 Aug 2023 08:10:43 +0300 Subject: [PATCH 2/2] Indent file --- src/android/FileUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/android/FileUtils.java b/src/android/FileUtils.java index c71dc77a..1faee74c 100644 --- a/src/android/FileUtils.java +++ b/src/android/FileUtils.java @@ -593,17 +593,17 @@ private void getReadPermission(String rawArgs, int action, CallbackContext callb if (android.os.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 { + } else { PermissionHelper.requestPermission(this, requestCode, Manifest.permission.READ_EXTERNAL_STORAGE); - } + } } private void getWritePermission(String rawArgs, int action, CallbackContext callbackContext) { - int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext); + int requestCode = pendingRequests.createRequest(rawArgs, action, callbackContext); if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - } else { - PermissionHelper.requestPermission(this, requestCode, Manifest.permission.WRITE_EXTERNAL_STORAGE); - } + } else { + PermissionHelper.requestPermission(this, requestCode, Manifest.permission.WRITE_EXTERNAL_STORAGE); + } } private boolean hasReadPermission() {