Merge pull request #4 from gallyamow/master

Storage updates in Android 11
agomezmoron · Mar 4, 2022 · 228aa34 · 228aa34
2 parents c6caf3d + 8fb3f6d
commit 228aa34
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-save-image-gallery",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "Cordova plugin to save base64 data as a png/jpg image into the device and applying compression if needed",
   "license": "MIT",
   "scripts": {

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns:android="http://schemas.android.com/apk/res/android" xmlns="http://www.phonegap.com/ns/plugins/1.0" id="cordova-save-image-gallery" version="0.0.26">
+<plugin xmlns:android="http://schemas.android.com/apk/res/android" xmlns="http://www.phonegap.com/ns/plugins/1.0" id="cordova-save-image-gallery" version="0.0.27">
 
   <engines>
     <engine name="cordova-ios" version=">=3.8.0" />

diff --git a/src/android/SaveImageGallery.java b/src/android/SaveImageGallery.java
@@ -67,7 +67,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
             } else {
                 Log.d("SaveImageGallery", "Requesting permissions for WRITE_EXTERNAL_STORAGE");
                 PermissionHelper.requestPermission(this, WRITE_PERM_REQUEST_CODE, WRITE_EXTERNAL_STORAGE);
-            } 
+            }
         }
 
         return true;
@@ -161,31 +161,25 @@ private File savePhoto(Bitmap bmp, String prefix, String format, int quality) {
         File retVal = null;
 
         try {
-            String deviceVersion = Build.VERSION.RELEASE;
             Calendar c = Calendar.getInstance();
             String date = EMPTY_STR + c.get(Calendar.YEAR) + c.get(Calendar.MONTH) + c.get(Calendar.DAY_OF_MONTH)
                     + c.get(Calendar.HOUR_OF_DAY) + c.get(Calendar.MINUTE) + c.get(Calendar.SECOND);
 
-            int check = deviceVersion.compareTo("2.3.3");
-
             File folder;
 
-            /*
-             * File path = Environment.getExternalStoragePublicDirectory(
-             * Environment.DIRECTORY_PICTURES ); //this throws error in Android
-             * 2.2
-             */
-            if (check >= 1) {
+            if (Build.VERSION.SDK_INT >= 30) {
+                // @see https://developer.android.com/about/versions/11/privacy/storage
+                folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1) {
                 folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
-
-                if (!folder.exists()) {
-                    folder.mkdirs();
-                }
-
             } else {
                 folder = Environment.getExternalStorageDirectory();
             }
 
+            if (!folder.exists()) {
+                folder.mkdirs();
+            }
+
             // building the filename
             String fileName = prefix + date;
             Bitmap.CompressFormat compressFormat = null;
@@ -243,12 +237,12 @@ public void onRequestPermissionResult(int requestCode, String[] permissions, int
 				return;
 			}
 		}
-		
+
 		switch (requestCode) {
 		case WRITE_PERM_REQUEST_CODE:
 			Log.d("SaveImageGallery", "User granted the permission for WRITE_EXTERNAL_STORAGE");
             saveBase64Image(this._args, this._callback);
 			break;
 		}
 	}
-}
+}