Support URI for attachment location. (#174)

* Support URI for attachment location.

* Add example path & uri to README comments.

Author: RobertGardner

README.md

@@ -124,13 +124,19 @@ export default class App extends Component {
       ccRecipients: ['[email protected]'],
       bccRecipients: ['[email protected]'],
       body: '<b>A Bold Body</b>',
-      customChooserTitle: "This is my new title", // Android only (defaults to "Send Mail")
+      customChooserTitle: 'This is my new title', // Android only (defaults to "Send Mail")
       isHTML: true,
       attachments: [{
-        path: '',  // The absolute path of the file from which to read data.
-        type: '',   // Mime Type: jpg, png, doc, ppt, html, pdf, csv
-        // mimeType - use only if you want to use custom type
-        name: '',   // Optional: Custom filename for attachment
+        // Specify either `path` or `uri` to indicate where to find the file data.
+        // The API used to create or locate the file will usually indicate which it returns.
+        // An absolute path will look like: /cacheDir/photos/some image.jpg
+        // A URI starts with a protocol and looks like: content://appname/cacheDir/photos/some%20image.jpg
+        path: '', // The absolute path of the file from which to read data.
+        uri: '', // The uri of the file from which to read the data.
+        // Specify either `type` or `mimeType` to indicate the type of data.
+        type: '', // Mime Type: jpg, png, doc, ppt, html, pdf, csv
+        mimeType: '', // - use only if you want to use custom type
+        name: '', // Optional: Custom filename for attachment
       }]
     }, (error, event) => {
       Alert.alert(

RNMail/RNMail.m

@@ -70,25 +70,37 @@ + (BOOL)requiresMainQueueSetup
         if (options[@"attachments"]) {
             NSArray *attachments = [RCTConvert NSArray:options[@"attachments"]];
             for (NSDictionary *attachment in attachments) {
-                if (attachment[@"path"] && (attachment[@"type"] || attachment[@"mimeType"])) {
+                if ((attachment[@"path"] || attachment[@"uri"]) && (attachment[@"type"] || attachment[@"mimeType"])) {
                     NSString *attachmentPath = [RCTConvert NSString:attachment[@"path"]];
+                    NSString *attachmentUri = [RCTConvert NSString:attachment[@"uri"]];
                     NSString *attachmentType = [RCTConvert NSString:attachment[@"type"]];
                     NSString *attachmentName = [RCTConvert NSString:attachment[@"name"]];
                     NSString *attachmentMimeType = [RCTConvert NSString:attachment[@"mimeType"]];
 
-                    NSFileManager *fileManager = [NSFileManager defaultManager];
-                    if (![fileManager fileExistsAtPath:attachmentPath]){
-                        callback(@[[NSString stringWithFormat: @"attachment file with path '%@' does not exist", attachmentPath]]);
-                        return;
-                    }
-                    
                     // Set default filename if not specificed
                     if (!attachmentName) {
                         attachmentName = [[attachmentPath lastPathComponent] stringByDeletingPathExtension];
                     }
 
-                    // Get the resource path and read the file using NSData
-                    NSData *fileData = [NSData dataWithContentsOfFile:attachmentPath];
+                    NSData *fileData;
+                    if (attachmentPath) {
+                        NSFileManager *fileManager = [NSFileManager defaultManager];
+                        if (![fileManager fileExistsAtPath:attachmentPath]){
+                            callback(@[[NSString stringWithFormat: @"attachment file with path '%@' does not exist", attachmentPath]]);
+                            return;
+                        }
+                        // Get the resource path and read the file using NSData
+                        fileData = [NSData dataWithContentsOfFile:attachmentPath];
+                    } else if (attachmentUri) {
+                        // Get the URI and read it using NSData
+                        NSURL *attachmentURL = [[NSURLComponents componentsWithString:attachmentUri] URL];
+                        NSError *error = nil;
+                        fileData = [NSData dataWithContentsOfURL:attachmentURL options:0 error:&error];
+                        if (!fileData) {
+                            callback(@[[NSString stringWithFormat: @"attachment file with uri '%@' does not exist", attachmentUri]]);
+                            return;
+                        }
+                    }
 
                     // Determine the MIME type
                     NSString *mimeType;

android/src/main/java/com/chirag/RNMail/RNMailModule.java

@@ -99,17 +99,24 @@ public void mail(ReadableMap options, Callback callback) {
       ArrayList<Uri> uris = new ArrayList<Uri>();
       for (int keyIndex = 0; keyIndex < length; keyIndex++) {
         ReadableMap clip = r.getMap(keyIndex);
-        if (clip.hasKey("path") && !clip.isNull("path")){
+        Uri uri;
+        if (clip.hasKey("path") && !clip.isNull("path")) {
           String path = clip.getString("path");
           File file = new File(path);
-          Uri uri = FileProvider.getUriForFile(reactContext, provider, file);
-          uris.add(uri);
-
-          for (ResolveInfo resolvedIntentInfo : resolvedIntentActivities) {
-            String packageName = resolvedIntentInfo.activityInfo.packageName;
-            reactContext.grantUriPermission(packageName, uri,
-                Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-          }
+          uri = FileProvider.getUriForFile(reactContext, provider, file);
+        } else if (clip.hasKey("uri") && !clip.isNull("uri")) {
+          String uriPath = clip.getString("uri");
+          uri = Uri.parse(uriPath);
+        } else {
+          callback.invoke("not_found");
+          return;
+        }
+        uris.add(uri);
+
+        for (ResolveInfo resolvedIntentInfo : resolvedIntentActivities) {
+          String packageName = resolvedIntentInfo.activityInfo.packageName;
+          reactContext.grantUriPermission(packageName, uri,
+              Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
         }
       }
 

index.d.ts

@@ -8,8 +8,9 @@ export namespace Mailer {
     customChooserTitle?: string;
     isHTML?: boolean;
     attachments?: {
-      path: string;
-      type?: string;
+      path?: string; // Specify either 'path' or 'uri'
+      uri?: string;
+      type?: string; // Specify either 'type' or 'mimeType'
       mimeType?: string;
       name?: string;
     }[]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mail",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "A wrapper on top of MFMailComposeViewController from iOS and Mail Intent on android",
   "author": {
     "name": "Chirag Jain",