From c847b75c5aad386ea0f54552df428bc31a17e090 Mon Sep 17 00:00:00 2001 From: Alexander Dunn Date: Tue, 7 Aug 2018 11:40:23 -0400 Subject: [PATCH 1/6] updating buildgradle to use 26 in order to support newer versions of RN --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 69ac46b..dc8993b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.3" defaultConfig { minSdkVersion 16 From e672176039fdb8ed87b14857c9085475e0e2671e Mon Sep 17 00:00:00 2001 From: Alexander Dunn Date: Tue, 14 Aug 2018 10:56:04 -0400 Subject: [PATCH 2/6] with RN 0.56 you need to specify which thread to run the bridging files on --- ios/RNMailCompose/RNMailCompose.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ios/RNMailCompose/RNMailCompose.swift b/ios/RNMailCompose/RNMailCompose.swift index f1435fe..e1f4278 100644 --- a/ios/RNMailCompose/RNMailCompose.swift +++ b/ios/RNMailCompose/RNMailCompose.swift @@ -134,5 +134,10 @@ class RNMailCompose: NSObject, MFMailComposeViewControllerDelegate { } return false } + + @objc + override open static func requiresMainQueueSetup() -> Bool { + return false + } } From d18da2140213a0a242c5fb9cbd4a5b87efeddbff Mon Sep 17 00:00:00 2001 From: Alexander Dunn Date: Tue, 14 Aug 2018 12:39:02 -0400 Subject: [PATCH 3/6] can't override here, just need to implement the method --- ios/RNMailCompose/RNMailCompose.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/RNMailCompose/RNMailCompose.swift b/ios/RNMailCompose/RNMailCompose.swift index e1f4278..8ff4708 100644 --- a/ios/RNMailCompose/RNMailCompose.swift +++ b/ios/RNMailCompose/RNMailCompose.swift @@ -136,7 +136,7 @@ class RNMailCompose: NSObject, MFMailComposeViewControllerDelegate { } @objc - override open static func requiresMainQueueSetup() -> Bool { + static func requiresMainQueueSetup() -> Bool { return false } } From f1e0f7fe2d50b3db6f0a9137b745406b74a86b65 Mon Sep 17 00:00:00 2001 From: HARRISON HIGGINS Date: Thu, 16 Aug 2018 10:25:42 -0400 Subject: [PATCH 4/6] Update external Uri handling for build sdks --- .../reactlibrary/mailcompose/RNMailComposeModule.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java b/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java index f0f2bd0..1737a8a 100644 --- a/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java +++ b/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java @@ -123,7 +123,16 @@ private void addAttachments(Intent intent, ReadableArray attachments) { } if (tempFile != null) { - uris.add(Uri.fromFile(tempFile)); + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) { + Uri apkURI = FileProvider.getUriForFile( + getReactApplicationContext(), + getReactApplicationContext().getApplicationContext() + .getPackageName() + ".provider", tempFile); + intent.setDataAndType(apkURI, "image/*"); + uris.add(apkURI); + } else { + uris.add(Uri.fromFile(tempFile)); + } } } } From 4eebd8274f3b7a1233704416e8624754f0153e78 Mon Sep 17 00:00:00 2001 From: HARRISON HIGGINS Date: Thu, 16 Aug 2018 10:32:03 -0400 Subject: [PATCH 5/6] Update request code to be 16 bits (throws an error otherwise) --- .../java/com/reactlibrary/mailcompose/RNMailComposeModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java b/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java index 1737a8a..b1d16a8 100644 --- a/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java +++ b/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java @@ -35,7 +35,7 @@ public class RNMailComposeModule extends ReactContextBaseJavaModule { - private static final int ACTIVITY_SEND = 129382; + private static final int ACTIVITY_SEND = 29382; private Promise mPromise; From 9199b988e92ba940743d893a7ca952d2fcc2ef77 Mon Sep 17 00:00:00 2001 From: Alexander Dunn Date: Mon, 20 Aug 2018 15:31:02 -0400 Subject: [PATCH 6/6] add missing imports --- .../java/com/reactlibrary/mailcompose/RNMailComposeModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java b/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java index b1d16a8..5f57be3 100644 --- a/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java +++ b/android/src/main/java/com/reactlibrary/mailcompose/RNMailComposeModule.java @@ -4,7 +4,9 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.support.v4.content.FileProvider; import android.text.Html; import android.text.Spanned; import android.util.Base64;