Add Whatsapp sharing and fix WebView load bug (#7)

dgtv · web-flow · commit dbc377adb2a8 · 2020-05-26T13:26:39.000+03:00
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 39
-        versionName "0.5.10"
+        versionCode 40
+        versionName "0.5.11"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/sdk/src/main/java/com/talkable/sdk/TalkableOfferFragment.java b/sdk/src/main/java/com/talkable/sdk/TalkableOfferFragment.java
@@ -47,6 +47,7 @@ public class TalkableOfferFragment extends Fragment {
     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;
+    public static final int REQUEST_CODE_SEND_WHATSAPP = 4;
 
     private WebView mWebView;
     private WebAppInterface mWebAppInterface;
@@ -112,13 +113,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     }
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
         initializeWebView();
 
         OfferWebData offerWebData = TalkablePreferencesStore.getOfferWebData(mOfferCode);
-        mWebView.loadDataWithBaseURL(offerWebData.getOriginUrl(), offerWebData.getHtml(), "text/html", "utf-8", null);
+        mWebView.loadDataWithBaseURL(Talkable.getServer(), offerWebData.getHtml(), "text/html", "utf-8", offerWebData.getOriginUrl());
     }
 
     @Override
@@ -138,6 +139,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_CODE_SEND_NATIVE_MAIL && resultCode == Activity.RESULT_OK) {
             shareSucceeded(SharingChannel.NATIVE_MAIL.toString());
         }
+
+        if (requestCode == REQUEST_CODE_SEND_WHATSAPP && resultCode == Activity.RESULT_OK) {
+            shareSucceeded(SharingChannel.WHATSAPP.toString());
+        }
     }
 
     public boolean onBackPressed() {
@@ -323,12 +328,28 @@ public void shareOfferViaFacebookMessage(String claimUrl) {
         FacebookUtils.shareViaMessenger(this, claimUrl);
     }
 
+    public void shareOfferViaWhatsApp(String message) {
+        if (!NativeFeatures.isAvailable(Feature.SHARE_VIA_WHATSAPP)) {
+            Log.d(Talkable.TAG, "Native feature called when not available: share_via_whatsapp");
+            return;
+        }
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.setPackage("com.whatsapp");
+        if (message != null) {
+            intent.putExtra(Intent.EXTRA_TEXT, message);
+        }
+        startActivityForResult(intent, REQUEST_CODE_SEND_WHATSAPP);
+    }
+
     public void copyToClipboard(String string) {
         if (getActivity() == null) return;
 
         ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
         ClipData clip = ClipData.newPlainText(string, string);
-        clipboard.setPrimaryClip(clip);
+        if (clipboard != null) {
+            clipboard.setPrimaryClip(clip);
+        }
     }
 
     public void popupOpened() {
diff --git a/sdk/src/main/java/com/talkable/sdk/WebAppInterface.java b/sdk/src/main/java/com/talkable/sdk/WebAppInterface.java
@@ -21,7 +21,7 @@ public void publish(String eventName, String data) {
         try {
             JsonObject json = new JsonObject();
             if (data.length() > 0) {
-                json = new JsonParser().parse(data).getAsJsonObject();
+                json = JsonParser.parseString(data).getAsJsonObject();
             }
             switch (eventName) {
                 case "put_to_clipboard":
@@ -71,6 +71,10 @@ public void publish(String eventName, String data) {
                     talkableOfferFragment.shareOfferViaTwitter(
                             JsonUtils.getJsonString(json, "message"));
                     break;
+                case "share_offer_via_whatsapp":
+                    talkableOfferFragment.shareOfferViaWhatsApp(
+                            JsonUtils.getJsonString(json, "message"));
+                    break;
                 case "share_offer_via_sms":
                     talkableOfferFragment.shareOfferViaSms(
                             JsonUtils.getJsonString(json, "recipients"),
diff --git a/sdk/src/main/java/com/talkable/sdk/models/SharingChannel.java b/sdk/src/main/java/com/talkable/sdk/models/SharingChannel.java
@@ -6,6 +6,7 @@ public enum SharingChannel {
     @SerializedName("facebook")             FACEBOOK("facebook"),
     @SerializedName("facebook_message")     FACEBOOK_MESSAGE("facebook_message"),
     @SerializedName("twitter")              TWITTER("twitter"),
+    @SerializedName("whatsapp")             WHATSAPP("whatsapp"),
     @SerializedName("linkedin")             LINKEDIN("linkedin"),
     @SerializedName("email")                EMAIL("email"),
     @SerializedName("sms")                  SMS("sms"),
diff --git a/sdk/src/main/java/com/talkable/sdk/utils/NativeFeatures.java b/sdk/src/main/java/com/talkable/sdk/utils/NativeFeatures.java
@@ -24,7 +24,8 @@ public enum Feature {
         SHARE_VIA_NATIVE_EMAIL("share_via_native_mail"),
         SHARE_VIA_TWITTER("share_via_twitter"),
         SHARE_VIA_FACEBOOK("share_via_facebook"),
-        SHARE_VIA_FACEBOOK_MESSENGER("share_via_facebook_messenger");
+        SHARE_VIA_FACEBOOK_MESSENGER("share_via_facebook_messenger"),
+        SHARE_VIA_WHATSAPP("share_via_whatsapp");
 
         private final String identifier;
 
@@ -42,9 +43,10 @@ public String toString() {
     }
 
     public static void initialize(Context context) {
-        Boolean isSmsAvailable = false;
-        Boolean isMessengerInstalled = false;
-        Boolean isMailAvailable = false;
+        boolean isSmsAvailable = false;
+        boolean isMessengerInstalled = false;
+        boolean isMailAvailable = false;
+        boolean isWhatsAppAvailable = false;
 
         if (context != null) {
             if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY) &&
@@ -53,13 +55,14 @@ public static void initialize(Context context) {
             }
 
             isMessengerInstalled = MessengerUtils.hasMessengerInstalled(context);
+            isWhatsAppAvailable  = isPackageInstalled("com.whatsapp", context);
 
             Intent sendNativeMailIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"));
-            List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentActivities(sendNativeMailIntent, 0);// .isEmpty();
+            List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentActivities(sendNativeMailIntent, 0);
             if (!resolveInfos.isEmpty()) {
                 // for some android emulators there is always "com.android.fallback/.Fallback" intent
                 // https://stackoverflow.com/a/31052350
-                List<ResolveInfo> filtered = new ArrayList<ResolveInfo>();
+                List<ResolveInfo> filtered = new ArrayList<>();
                 for (ResolveInfo info : resolveInfos) {
                     String packageName = info.activityInfo.packageName;
                     if (!packageName.toLowerCase().contains("fallback")) {
@@ -77,6 +80,7 @@ public static void initialize(Context context) {
         json.addProperty(Feature.SHARE_VIA_FACEBOOK_MESSENGER.toString(), FacebookSdk.isInitialized() && isMessengerInstalled);
         json.addProperty(Feature.SHARE_VIA_TWITTER.toString(), false);
         json.addProperty(Feature.SHARE_VIA_NATIVE_EMAIL.toString(), isMailAvailable);
+        json.addProperty(Feature.SHARE_VIA_WHATSAPP.toString(), isWhatsAppAvailable);
         json.addProperty("sdk_version", BuildConfig.VERSION_NAME);
         json.addProperty("sdk_build", BuildConfig.VERSION_CODE);
 
@@ -90,4 +94,12 @@ public static String getFeatures() {
     public static boolean isAvailable(Feature feature) {
         return JsonUtils.getJsonBoolean(features, feature.toString());
     }
+
+    private static boolean isPackageInstalled(String packageName, Context context) {
+        try {
+            return context.getPackageManager().getApplicationInfo(packageName, 0).enabled;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
 }
