[PR-11804] Native email sharing (#4)

* [PR-11804] Native email sharing * Remove recipients, bump version
talkable · Jul 29, 2019 · 8a24409 · 8a24409
1 parent 5808fcd
commit 8a24409
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'de.mobilej.unmock:UnMockPlugin:0.6.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 38
-        versionName "0.5.8"
+        versionName "0.5.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -58,5 +58,5 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.2.0'
     implementation 'com.facebook.android:facebook-android-sdk:[4,5)'
     implementation 'com.google.code.gson:gson:2.8.+'
-    implementation 'com.android.support:support-v4:26.1.0'
+    implementation 'com.android.support:support-v4:27.1.0'
 }
diff --git a/sdk/src/main/java/com/talkable/sdk/TalkableOfferFragment.java b/sdk/src/main/java/com/talkable/sdk/TalkableOfferFragment.java
@@ -39,10 +39,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import android.app.Activity;
+
 public class TalkableOfferFragment extends Fragment {
     public static final String OFFER_CODE_PARAM = "offer_code_param";
-    public static final int SEND_SMS_CODE = 1;
-    public static final int REQUEST_READ_CONTACTS = 2;
+    public static final int REQUEST_CODE_SEND_SMS = 1;
+    public static final int REQUEST_CODE_READ_CONTACTS = 2;
+    public static final int REQUEST_CODE_SEND_NATIVE_MAIL = 3;
 
     private WebView mWebView;
     private WebAppInterface mWebAppInterface;
@@ -125,9 +128,15 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             FacebookUtils.onActivityResult(requestCode, resultCode, data);
         }
 
-        if (requestCode == SEND_SMS_CODE && mWebAppInterface != null) { // resultCode always RESULT_CANCELED for Intent.ACTION_SENDTO
+        if (mWebAppInterface == null) return;
+
+        if (requestCode == REQUEST_CODE_SEND_SMS) { // resultCode always RESULT_CANCELED for SMS sharing
             shareSucceeded(SharingChannel.SMS.toString());
         }
+
+        if (requestCode == REQUEST_CODE_SEND_NATIVE_MAIL && resultCode == Activity.RESULT_OK) {
+            shareSucceeded(SharingChannel.NATIVE_MAIL.toString());
+        }
     }
 
     public boolean onBackPressed() {
@@ -216,17 +225,25 @@ public void shareSucceeded(String channel) {
     // Callbacks |
     //-----------+
 
+    public void shareOfferViaNativeMail(String subject, String message, String claimUrl) {
+        Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"));
+        if (subject != null) {
+            intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        }
+        if (message != null) {
+            intent.putExtra(Intent.EXTRA_TEXT, message);
+        }
+        startActivityForResult(intent, REQUEST_CODE_SEND_NATIVE_MAIL);
+    }
+
     public void shareOfferViaSms(String recipients, String message, String claimUrl) {
         String uriString = "sms:";
-        if (recipients != null) {
-            uriString += recipients;
-        }
         Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse(uriString));
         if (message != null && claimUrl != null && !message.contains(claimUrl)) {
             message += " " + claimUrl;
         }
         intent.putExtra("sms_body", message);
-        startActivityForResult(intent, TalkableOfferFragment.SEND_SMS_CODE);
+        startActivityForResult(intent, REQUEST_CODE_SEND_SMS);
     }
 
     public void importContacts() {
@@ -236,14 +253,14 @@ public void importContacts() {
                 == PackageManager.PERMISSION_GRANTED) {
             publishImportedContacts();
         } else {
-            requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_READ_CONTACTS);
+            requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_CODE_READ_CONTACTS);
         }
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         switch (requestCode) {
-            case REQUEST_READ_CONTACTS:
+            case REQUEST_CODE_READ_CONTACTS:
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     publishImportedContacts();
                 } else {

diff --git a/sdk/src/main/java/com/talkable/sdk/WebAppInterface.java b/sdk/src/main/java/com/talkable/sdk/WebAppInterface.java
@@ -50,6 +50,13 @@ public void publish(String eventName, String data) {
                     talkableOfferFragment.responsiveIframeHeight(
                             JsonUtils.getJsonInt(json, "height"));
                     break;
+                case "share_offer_via_native_mail":
+                    talkableOfferFragment.shareOfferViaNativeMail(
+                            JsonUtils.getJsonString(json, "subject"),
+                            JsonUtils.getJsonString(json, "message"),
+                            JsonUtils.getJsonString(json, "claim_url")
+                    );
+                    break;
                 case "share_offer_via_facebook":
                     talkableOfferFragment.shareOfferViaFacebook(
                             JsonUtils.getJsonString(json, "claim_url"),

diff --git a/sdk/src/main/java/com/talkable/sdk/models/SharingChannel.java b/sdk/src/main/java/com/talkable/sdk/models/SharingChannel.java
@@ -3,13 +3,14 @@
 import com.google.gson.annotations.SerializedName;
 
 public enum SharingChannel {
-    @SerializedName("facebook")         FACEBOOK("facebook"),
-    @SerializedName("facebook_message") FACEBOOK_MESSAGE("facebook_message"),
-    @SerializedName("twitter")          TWITTER("twitter"),
-    @SerializedName("linkedin")         LINKEDIN("linkedin"),
-    @SerializedName("email")            EMAIL("email"),
-    @SerializedName("sms")              SMS("sms"),
-    @SerializedName("other")            OTHER("other");
+    @SerializedName("facebook")             FACEBOOK("facebook"),
+    @SerializedName("facebook_message")     FACEBOOK_MESSAGE("facebook_message"),
+    @SerializedName("twitter")              TWITTER("twitter"),
+    @SerializedName("linkedin")             LINKEDIN("linkedin"),
+    @SerializedName("email")                EMAIL("email"),
+    @SerializedName("sms")                  SMS("sms"),
+    @SerializedName("other")                OTHER("other"),
+    @SerializedName("direct_email_native")  NATIVE_MAIL("direct_email_native");
 
     private final String identifier;