react-native-share 7.2.1 → 7.3.0

package/android/src/main/java/cl/json/RNSharePathUtil.java

@@ -63,7 +63,7 @@ public class RNSharePathUtil {
         return result;
     }
 
-    public static String getRealPathFromURI(final Context context, final Uri uri) {
+    public static String getRealPathFromURI(final Context context, final Uri uri, Boolean useInternalStorage) {
 
         String filePrefix = "";
         // DocumentProvider
@@ -76,7 +76,8 @@ public class RNSharePathUtil {
                 final String type = split[0];
 
                 if ("primary".equalsIgnoreCase(type) || "0".equalsIgnoreCase(type)) {
-                    return filePrefix + context.getExternalCacheDir() + "/" + split[1];
+                    File cacheDir = useInternalStorage ? context.getCacheDir() : context.getExternalCacheDir();
+                    return filePrefix + cacheDir + "/" + split[1];
                 } else if ("raw".equalsIgnoreCase(type)) {
                     return filePrefix + split[1];
                 } else if (!TextUtils.isEmpty(type)) {

package/android/src/main/java/cl/json/ShareFile.java

@@ -23,18 +23,19 @@ public class ShareFile {
     private Uri uri;
     private String type;
     private String filename;
+    private Boolean useInternalStorage;
 
-    public ShareFile(String url, String type, String filename, ReactApplicationContext reactContext){
-        this(url, filename, reactContext);
+    public ShareFile(String url, String type, String filename, Boolean useInternalStorage, ReactApplicationContext reactContext){
+        this(url, filename, useInternalStorage, reactContext);
         this.type = type;
-        this.filename = filename;
     }
 
-    public ShareFile(String url, String filename, ReactApplicationContext reactContext){
+    public ShareFile(String url, String filename, Boolean useInternalStorage, ReactApplicationContext reactContext){
         this.url = url;
         this.uri = Uri.parse(this.url);
-        this.reactContext = reactContext;
         this.filename = filename;
+        this.useInternalStorage = useInternalStorage;
+        this.reactContext = reactContext;
     }
     /**
      * Obtain mime type from URL
@@ -110,7 +111,7 @@ public class ShareFile {
         return this.type;
     }
     private String getRealPathFromURI(Uri contentUri) {
-        String result = RNSharePathUtil.getRealPathFromURI(this.reactContext, contentUri);
+        String result = RNSharePathUtil.getRealPathFromURI(this.reactContext,  contentUri, this.useInternalStorage);
         return result;
     }
     public Uri getURI() {
@@ -122,7 +123,8 @@ public class ShareFile {
             String encodedImg = this.uri.toString().substring(BASE_64_DATA_LENGTH + this.type.length() + BASE_64_DATA_OFFSET);
             String filename = this.filename != null ? this.filename : System.nanoTime() + "";
             try {
-                File dir = new File(this.reactContext.getExternalCacheDir(), Environment.DIRECTORY_DOWNLOADS );
+                File cacheDir = this.useInternalStorage ? this.reactContext.getCacheDir() : this.reactContext.getExternalCacheDir();
+                File dir = new File(cacheDir, Environment.DIRECTORY_DOWNLOADS);
                 if (!dir.exists() && !dir.mkdirs()) {
                     throw new IOException("mkdirs failed on " + dir.getAbsolutePath());
                 }

package/android/src/main/java/cl/json/ShareFiles.java

@@ -23,13 +23,14 @@ public class ShareFiles
     private ArrayList<Uri> uris;
     private ArrayList<String> filenames;
     private String intentType;
+    private Boolean useInternalStorage;
 
-    public ShareFiles(ReadableArray urls, ArrayList<String> filenames, String type, ReactApplicationContext reactContext) {
-        this(urls, filenames, reactContext);
+    public ShareFiles(ReadableArray urls, ArrayList<String> filenames, String type, Boolean useInternalStorage, ReactApplicationContext reactContext) {
+        this(urls, filenames, useInternalStorage, reactContext);
         this.intentType = type;
     }
 
-    public ShareFiles(ReadableArray urls, ArrayList<String> filenames, ReactApplicationContext reactContext) {
+    public ShareFiles(ReadableArray urls, ArrayList<String> filenames, Boolean useInternalStorage, ReactApplicationContext reactContext) {
         this.uris = new ArrayList<>();
         for (int i = 0; i < urls.size(); i++) {
             String url = urls.getString(i);
@@ -39,6 +40,7 @@ public class ShareFiles
             }
         }
         this.filenames = filenames;
+        this.useInternalStorage = useInternalStorage;
         this.reactContext = reactContext;
     }
     /**
@@ -124,7 +126,7 @@ public class ShareFiles
     }
 
     private String getRealPathFromURI(Uri contentUri) {
-        String result = RNSharePathUtil.getRealPathFromURI(this.reactContext, contentUri);
+        String result = RNSharePathUtil.getRealPathFromURI(this.reactContext, contentUri, this.useInternalStorage);
         return result;
     }
 
@@ -141,7 +143,8 @@ public class ShareFiles
                 String encodedImg = uri.getSchemeSpecificPart().substring(uri.getSchemeSpecificPart().indexOf(";base64,") + 8);
                 String fileName = filenames.size() >= uriIndex + 1 ? filenames.get(uriIndex) : (System.currentTimeMillis() + "." + extension);
                 try {
-                    File dir = new File(this.reactContext.getExternalCacheDir(), Environment.DIRECTORY_DOWNLOADS );
+                    File cacheDir = this.useInternalStorage ? this.reactContext.getCacheDir() : this.reactContext.getExternalCacheDir();
+                    File dir = new File(cacheDir, Environment.DIRECTORY_DOWNLOADS);
                     if (!dir.exists() && !dir.mkdirs()) {
                         throw new IOException("mkdirs failed on " + dir.getAbsolutePath());
                     }

package/android/src/main/java/cl/json/social/FacebookStoriesShare.java

@@ -81,6 +81,11 @@ public class FacebookStoriesShare extends SingleShareIntent {
             this.intent.putExtra("bottom_background_color", options.getString("backgroundBottomColor"));
         }
 
+        Boolean useInternalStorage = false;
+        if (this.hasValidKey("useInternalStorage", options)) {
+            useInternalStorage = options.getBoolean("useInternalStorage");
+        }
+
         Boolean hasBackgroundAsset = this.hasValidKey("backgroundImage", options)
                 || this.hasValidKey("backgroundVideo", options);
 
@@ -93,14 +98,14 @@ public class FacebookStoriesShare extends SingleShareIntent {
                 backgroundFileName = options.getString("backgroundVideo");
             }
 
-            ShareFile backgroundAsset = new ShareFile(backgroundFileName, "background", this.reactContext);
+            ShareFile backgroundAsset = new ShareFile(backgroundFileName, "background", useInternalStorage, this.reactContext);
 
             this.intent.setDataAndType(backgroundAsset.getURI(), backgroundAsset.getType());
             this.intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         }
 
         if (this.hasValidKey("stickerImage", options)) {
-            ShareFile stickerAsset = new ShareFile(options.getString("stickerImage"), "sticker", this.reactContext);
+            ShareFile stickerAsset = new ShareFile(options.getString("stickerImage"), "sticker", useInternalStorage, this.reactContext);
 
             if (!hasBackgroundAsset) {
                 this.intent.setType("image/*");

package/android/src/main/java/cl/json/social/InstagramStoriesShare.java

@@ -76,6 +76,11 @@ public class InstagramStoriesShare extends SingleShareIntent {
             this.intent.putExtra("bottom_background_color", options.getString("backgroundBottomColor"));
         }
 
+        Boolean useInternalStorage = false;
+        if (this.hasValidKey("useInternalStorage", options)) {
+            useInternalStorage = options.getBoolean("useInternalStorage");
+        }
+
         Boolean hasBackgroundAsset = this.hasValidKey("backgroundImage", options)
                 || this.hasValidKey("backgroundVideo", options);
 
@@ -88,14 +93,14 @@ public class InstagramStoriesShare extends SingleShareIntent {
                 backgroundFileName = options.getString("backgroundVideo");
             }
 
-            ShareFile backgroundAsset = new ShareFile(backgroundFileName, "background", this.reactContext);
+            ShareFile backgroundAsset = new ShareFile(backgroundFileName, "background", useInternalStorage, this.reactContext);
 
             this.intent.setDataAndType(backgroundAsset.getURI(), backgroundAsset.getType());
             this.intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         }
 
         if (this.hasValidKey("stickerImage", options)) {
-            ShareFile stickerAsset = new ShareFile(options.getString("stickerImage"), "sticker", this.reactContext);
+            ShareFile stickerAsset = new ShareFile(options.getString("stickerImage"), "sticker", useInternalStorage, this.reactContext);
 
             if (!hasBackgroundAsset) {
                 this.intent.setType("image/*");

package/android/src/main/java/cl/json/social/ShareIntent.java

@@ -135,7 +135,7 @@ public abstract class ShareIntent {
                 this.getIntent().putExtra("jid", chatAddress);
             }
         }
-        
+
         if (socialType.equals("whatsappbusiness")) {
             if (options.hasKey("whatsAppNumber")) {
                 String whatsAppNumber = options.getString("whatsAppNumber");
@@ -186,14 +186,19 @@ public abstract class ShareIntent {
     }
 
     protected ShareFile getFileShare(ReadableMap options) {
-         String filename = null;
+        String filename = null;
         if (ShareIntent.hasValidKey("filename", options)) {
             filename = options.getString("filename");
         }
+
+        Boolean useInternalStorage = false;
+        if (ShareIntent.hasValidKey("useInternalStorage", options)) {
+            useInternalStorage = options.getBoolean("useInternalStorage");
+        }
         if (ShareIntent.hasValidKey("type", options)) {
-            return new ShareFile(options.getString("url"), options.getString("type"), filename, this.reactContext);
+            return new ShareFile(options.getString("url"), options.getString("type"), filename, useInternalStorage, this.reactContext);
         } else {
-            return new ShareFile(options.getString("url"), filename, this.reactContext);
+            return new ShareFile(options.getString("url"), filename, useInternalStorage, this.reactContext);
         }
     }
 
@@ -206,10 +211,14 @@ public abstract class ShareIntent {
             }
         }
 
+        Boolean useInternalStorage = false;
+        if (ShareIntent.hasValidKey("useInternalStorage", options)) {
+            useInternalStorage = options.getBoolean("useInternalStorage");
+        }
         if (ShareIntent.hasValidKey("type", options)) {
-            return new ShareFiles(options.getArray("urls"), filenames, options.getString("type"), this.reactContext);
+            return new ShareFiles(options.getArray("urls"), filenames, options.getString("type"), useInternalStorage, this.reactContext);
         } else {
-            return new ShareFiles(options.getArray("urls"), filenames, this.reactContext);
+            return new ShareFiles(options.getArray("urls"), filenames, useInternalStorage, this.reactContext);
         }
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-share",
   "description": "Social share, sending simple data to other apps.",
-  "version": "7.2.1",
+  "version": "7.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/react-native-community/react-native-share.git"