From 54370f352e1ef910a643fd2d7f0e5f5b74f6eacb Mon Sep 17 00:00:00 2001
From: Chris Geirman <chris@geirman.com>
Date: Fri, 6 Oct 2017 17:11:06 +0200
Subject: [PATCH 1/5] add  and update the example for es6

---
 README.md | 71 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 2879936..7babbf3 100644
--- a/README.md
+++ b/README.md
@@ -3,15 +3,23 @@
 A React Native wrapper for Apple's ``MFMailComposeViewController`` from iOS and Mail Intent on android
 Supports emails with attachments.
 
-### Installation
+## Installation
 
 There was a breaking change in RN >=40. So for React Native >= 0.40: use v3.x and higher of this lib. otherwise use v2.x
 
 ```bash
-npm i --save react-native-mail
+npm i --save react-native-mail # npm syntax
+yarn add react-native-mail # yarn syntax
 ```
 
-### Add it to your android project
+### Automatic Installation
+You can automatically link the native components or follow the manual instructions below if you prefer.
+
+ ```bash
+ react-native link
+ ```
+
+### Manual Installation: Android
 
 * In `android/setting.gradle`
 
@@ -85,7 +93,7 @@ public class MainApplication extends Application implements ReactApplication {
 
 
 
-### Add it to your iOS project
+### Manual Installation: iOS
 
 1. Run `npm install react-native-mail --save`
 2. Open your project in XCode, right click on `Libraries` and click `Add
@@ -97,16 +105,26 @@ public class MainApplication extends Application implements ReactApplication {
 
 ## Example
 ```javascript
-var Mailer = require('react-native-mail');
+/**
+ * Sample React Native App
+ * https://github.com/facebook/react-native
+ * @flow
+ */
+
+import React, { Component } from 'react';
+import { View, Button } from 'react-native';
+import Mailer from 'react-native-mail';
 
-var MailExampleApp = React.createClass({
-  handleHelp: function() {
+export default class App extends Component<{}> {
+
+  handleEmail = () => {
+    console.log(Mailer);
     Mailer.mail({
       subject: 'need help',
       recipients: ['support@example.com'],
       ccRecipients: ['supportCC@example.com'],
       bccRecipients: ['supportBCC@example.com'],
-      body: '',
+      body: '<b>A Bold Body</b>',
       isHTML: true,
       attachment: {
         path: '',  // The absolute path of the file from which to read data.
@@ -114,23 +132,34 @@ var MailExampleApp = React.createClass({
         name: '',   // Optional: Custom filename for attachment
       }
     }, (error, event) => {
-        if(error) {
-          AlertIOS.alert('Error', 'Could not send mail. Please send a mail to support@example.com');
-        }
+      console.log(error);
+      Alert.alert(
+        'Error',
+        'Email could not be sent',
+        [
+          {text: 'Ok', onPress: () => console.log('OK: Email Error Response')},
+          {text: 'Cancel', onPress: () => console.log('CANCEL: Email Error Response')}
+        ],
+        { cancelable: true }
+      )
     });
-  },  
-  render: function() {
+  }
+
+  render() {
     return (
-      <TouchableHighlight
-            onPress={row.handleHelp}
-            underlayColor="#f7f7f7">
-	      <View style={styles.container}>
-	        <Image source={require('image!announcement')} style={styles.image} />
-	      </View>
-	   </TouchableHighlight>
+      <View style={styles.container}>
+        <Button
+          onPress={this.handleEmail}
+          title="Email Me"
+          color="#841584"
+          accessabilityLabel="Purple Email Me Button"
+        />
+      </View>
     );
   }
-});
+}
+
+
 ```
 
 ### Note

From 47c7fbb629205a06a30a7fb6272db002240b74c9 Mon Sep 17 00:00:00 2001
From: Chris Geirman <chris@geirman.com>
Date: Fri, 6 Oct 2017 17:44:43 +0200
Subject: [PATCH 2/5] minor edits

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7babbf3..23ed87b 100644
--- a/README.md
+++ b/README.md
@@ -115,10 +115,9 @@ import React, { Component } from 'react';
 import { View, Button } from 'react-native';
 import Mailer from 'react-native-mail';
 
-export default class App extends Component<{}> {
+export default class App extends Component {
 
   handleEmail = () => {
-    console.log(Mailer);
     Mailer.mail({
       subject: 'need help',
       recipients: ['support@example.com'],

From 0818d3b0e0962141ebe94937d9de982b3929ac19 Mon Sep 17 00:00:00 2001
From: Chris Geirman <chris@geirman.com>
Date: Fri, 6 Oct 2017 17:47:48 +0200
Subject: [PATCH 3/5] remove one more console.log and import missing Alert
 dependency

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 23ed87b..84b7e0e 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ public class MainApplication extends Application implements ReactApplication {
  */
 
 import React, { Component } from 'react';
-import { View, Button } from 'react-native';
+import { View, Alert, Button } from 'react-native';
 import Mailer from 'react-native-mail';
 
 export default class App extends Component {
@@ -131,7 +131,6 @@ export default class App extends Component {
         name: '',   // Optional: Custom filename for attachment
       }
     }, (error, event) => {
-      console.log(error);
       Alert.alert(
         'Error',
         'Email could not be sent',

From ab4931a299e550ac658a0bec14bbb61128cc4319 Mon Sep 17 00:00:00 2001
From: Chris Geirman <chris@geirman.com>
Date: Fri, 6 Oct 2017 18:16:14 +0200
Subject: [PATCH 4/5] simplify alert

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 84b7e0e..f0d9597 100644
--- a/README.md
+++ b/README.md
@@ -132,8 +132,8 @@ export default class App extends Component {
       }
     }, (error, event) => {
       Alert.alert(
-        'Error',
-        'Email could not be sent',
+        error,
+        event,
         [
           {text: 'Ok', onPress: () => console.log('OK: Email Error Response')},
           {text: 'Cancel', onPress: () => console.log('CANCEL: Email Error Response')}

From e183ba979f4e633161d41733ae57ec4678005f3e Mon Sep 17 00:00:00 2001
From: Chris Geirman <chris@geirman.com>
Date: Thu, 9 Nov 2017 13:29:14 -0800
Subject: [PATCH 5/5] use/convert url string rather than filepath

---
 RNMail/RNMail.m | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/RNMail/RNMail.m b/RNMail/RNMail.m
index c04276f..d7d7dae 100644
--- a/RNMail/RNMail.m
+++ b/RNMail/RNMail.m
@@ -36,9 +36,9 @@ - (dispatch_queue_t)methodQueue
             NSString *subject = [RCTConvert NSString:options[@"subject"]];
             [mail setSubject:subject];
         }
-        
+
         bool *isHTML = NO;
-        
+
         if (options[@"isHTML"]){
             isHTML = [options[@"isHTML"] boolValue];
         }
@@ -57,7 +57,7 @@ - (dispatch_queue_t)methodQueue
             NSArray *ccRecipients = [RCTConvert NSArray:options[@"ccRecipients"]];
             [mail setCcRecipients:ccRecipients];
         }
-        
+
         if (options[@"bccRecipients"]){
             NSArray *bccRecipients = [RCTConvert NSArray:options[@"bccRecipients"]];
             [mail setBccRecipients:bccRecipients];
@@ -73,12 +73,23 @@ - (dispatch_queue_t)methodQueue
                 attachmentName = [[attachmentPath lastPathComponent] stringByDeletingPathExtension];
             }
 
+            // Get the URL string, which is *not* a path (e.g. because it's file:// based)
+            NSString *attachmentURLString = [RCTConvert NSString:options[@"attachment"][@"path"]];
+            // Create a URL from the string
+            NSURL *attachmentURL = [[NSURLComponents componentsWithString:attachmentURLString] URL];
+
             // Get the resource path and read the file using NSData
-            NSData *fileData = [NSData dataWithContentsOfFile:attachmentPath];
+            NSError *error = nil;
+            NSData *fileData = [NSData dataWithContentsOfURL:attachmentURL options:0 error:&error];
+
+            if(fileData == nil) {
+                // handle error
+            }
+
 
             // Determine the MIME type
             NSString *mimeType;
-            
+
             /*
              * Add additional mime types and PR if necessary. Find the list
              * of supported formats at http://www.iana.org/assignments/media-types/media-types.xhtml