Merge pull request #1 from BatchLabs/feature/sdk_1.17

Added support for Batch WebView In-App format.

Author: abarisain

CHANGELOG.md

@@ -1,3 +1,8 @@
+UPCOMING
+-----
+
+ * Added support for Batch WebView In-App format. The dispatcher now requires Batch 1.17 or higher.
+
 1.1.1
 -----
 

README.md

@@ -4,7 +4,7 @@
 Batch.com Android Mixpanel Dispatcher
 ==================
 
-![Logo](http://batch-doc.s3.amazonaws.com/logo_batch_192.gif)
+![Logo](https://static.batch.com/documentation/Readmes/logo_batch_full_178.png)
 
 # About
 
@@ -13,14 +13,14 @@ A "ready-to-go" dispatcher that reflect event from the Batch SDK to Mixpanel usi
 # Requirements
  - Android Studio 3.0+
  - Android 15+
- - Batch Android SDK 1.15.0+
+ - Batch Android SDK 1.17.0+
  - Mixpanel 5+
 
 # Installation
 Gradle (recommended)
 
 ```
-implementation 'com.batch.android:mixpanel-dispatcher:1.0.0'
+implementation 'com.batch.android:mixpanel-dispatcher:2.0.0'
 ```
 
 Read our [setup documentation](https://doc.batch.com/) to follow a step by step tutorial for integrating Batch features into your app.

mixpanel-dispatcher/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    api 'com.batch.android:batch-sdk:1.16.1'
+    api 'com.batch.android:batch-sdk:1.17.0'
     api 'com.mixpanel.android:mixpanel-android:5.8.0'
 
     testImplementation 'junit:junit:4.12'

mixpanel-dispatcher/src/main/java/com/batch/android/dispatcher/mixpanel/MixpanelDispatcher.java

@@ -42,6 +42,11 @@ public class MixpanelDispatcher implements BatchEventDispatcher
      */
     private static final String BATCH_TRACKING_ID = "batch_tracking_id";
 
+    /**
+     * Key used to dispatch the webview click analytics ID
+     */
+    private static final String BATCH_WEBVIEW_ANALYTICS_ID = "batch_webview_analytics_id";
+
     /**
      * Event name used when logging on Mixpanel
      */
@@ -51,7 +56,9 @@ public class MixpanelDispatcher implements BatchEventDispatcher
     private static final String MESSAGING_SHOW_NAME = "batch_in_app_show";
     private static final String MESSAGING_CLOSE_NAME = "batch_in_app_close";
     private static final String MESSAGING_AUTO_CLOSE_NAME = "batch_in_app_auto_close";
+    private static final String MESSAGING_CLOSE_ERROR_NAME = "batch_in_app_close_error";
     private static final String MESSAGING_CLICK_NAME = "batch_in_app_click";
+    private static final String MESSAGING_WEBVIEW_CLICK_NAME = "batch_in_app_webview_click";
     private static final String UNKNOWN_EVENT_NAME = "batch_unknown";
 
     MixpanelAPI mixpanelInstance = null;
@@ -112,6 +119,11 @@ private static Map<String, Object> getInAppParams(Batch.EventDispatcher.Payload
         mixpanelParams.put(MEDIUM, "in-app");
         mixpanelParams.put(BATCH_TRACKING_ID, payload.getTrackingId());
 
+        String webViewAnalyticsId = payload.getWebViewAnalyticsID();
+        if (webViewAnalyticsId != null) {
+            mixpanelParams.put(BATCH_WEBVIEW_ANALYTICS_ID, webViewAnalyticsId);
+        }
+
         String deeplink = payload.getDeeplink();
         if (deeplink != null) {
             deeplink = deeplink.trim();
@@ -229,8 +241,12 @@ private static String getMixpanelEventName(Batch.EventDispatcher.Type type) {
                 return MESSAGING_CLOSE_NAME;
             case MESSAGING_AUTO_CLOSE:
                 return MESSAGING_AUTO_CLOSE_NAME;
+            case MESSAGING_CLOSE_ERROR:
+                return MESSAGING_CLOSE_ERROR_NAME;
             case MESSAGING_CLICK:
                 return MESSAGING_CLICK_NAME;
+            case MESSAGING_WEBVIEW_CLICK:
+                return MESSAGING_WEBVIEW_CLICK_NAME;
         }
         return UNKNOWN_EVENT_NAME;
     }