Merge pull request #15 from WebEngage/develop

v1.1.0

Author: BhaveshWebEngage

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-webengage",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "WebEngage Plugin that integrates with WebEngage native SDKs(Android & iOS) to provide engagement capabilities for hybrid applications built with PhoneGap/Cordova",
   "main": "WebEngagePlugin.js",
   "dependencies": {

src/android/WebEngagePlugin.gradle

@@ -12,6 +12,5 @@ allprojects {
     }
 }
 dependencies {
- 	implementation 'com.webengage:android-sdk:3.18+'
-	implementation 'com.google.android.gms:play-services-location:10+'
+    api 'com.webengage:android-sdk:[3,)'
 }

src/android/WebEngagePlugin.java

@@ -36,12 +36,11 @@
 import com.webengage.sdk.android.actions.render.PushNotificationData;
 import com.webengage.sdk.android.actions.render.InAppNotificationData;
 import com.webengage.sdk.android.callbacks.InAppNotificationCallbacks;
-import com.webengage.sdk.android.callbacks.LifeCycleCallbacks;
 import com.webengage.sdk.android.UserProfile;
 import com.webengage.sdk.android.utils.Gender;
 
 
-public class WebEngagePlugin extends CordovaPlugin implements PushNotificationCallbacks, InAppNotificationCallbacks, LifeCycleCallbacks {
+public class WebEngagePlugin extends CordovaPlugin implements PushNotificationCallbacks, InAppNotificationCallbacks {
     private static final String TAG = "WebEngagePlugin";
     private static CordovaWebView webView;
 
@@ -89,7 +88,6 @@ public boolean execute(String action, JSONArray args, final CallbackContext call
         if ("engage".equals(action)) {
             WebEngage.registerPushNotificationCallback(this);
             WebEngage.registerInAppNotificationCallback(this);
-            WebEngage.registerLifeCycleCallback(this);
 
             if (args != null && args.length() > 0 && args.get(0) instanceof JSONObject) {
                 // Dynamic config
@@ -265,6 +263,10 @@ public boolean execute(String action, JSONArray args, final CallbackContext call
             }
         } else if ("logout".equals(action)) {
             WebEngage.get().user().logout();
+        } else if ("setDevicePushOptIn".equals(action)) {
+            if (args.length() == 1 && args.get(0) instanceof Boolean) {
+                WebEngage.get().user().setDevicePushOptIn(args.getBoolean(0));
+            }
         }
 
         return true;
@@ -336,10 +338,21 @@ public PushNotificationData onPushNotificationReceived(Context context, PushNoti
         return notificationData;
     }
 
-    public static void handlePushClick(String uri, Bundle data) {
+    public static void handlePushClick(String uri, Bundle customData) {
         IS_PUSH_CALLBACK_PENDING = true;
         PENDING_PUSH_URI = uri;
-        PENDING_PUSH_CUSTOM_DATA = bundleToJson(data);
+        JSONObject data = bundleToJson(customData);
+        JSONObject pushPayload = null;
+        try {
+            if (customData != null && customData.containsKey("we_pushPayload")) {
+                pushPayload = new JSONObject(customData.getString("we_pushPayload"));
+                data.remove("we_pushPayload");
+                mergeJson(data, pushPayload);
+            }
+        } catch (JSONException e) {
+            Logger.e(TAG, "error merging json");
+        }
+        PENDING_PUSH_CUSTOM_DATA = data;
         Logger.d(TAG, "handlePushClick invoked");
     }
 
@@ -354,6 +367,12 @@ public void onPushNotificationShown(Context context, PushNotificationData notifi
     public boolean onPushNotificationClicked(Context context, PushNotificationData notificationData) {
         String uri = notificationData.getPrimeCallToAction().getAction();
         JSONObject customData = bundleToJson(notificationData.getCustomData());
+        try {
+            customData = mergeJson(bundleToJson(notificationData.getCustomData()), notificationData.getPushPayloadJSON());
+        } catch (JSONException e) {
+            e.printStackTrace();
+            Logger.e(TAG, "Exception while merging JSON");
+        }
         webView.sendJavascript("javascript:webengage.push.onCallbackReceived( 'click', '" + uri + "'," + customData + ");");
         return false;
     }
@@ -362,6 +381,12 @@ public boolean onPushNotificationClicked(Context context, PushNotificationData n
     public boolean onPushNotificationActionClicked(Context context, PushNotificationData notificationData, String buttonID) {
         String uri = notificationData.getCallToActionById(buttonID).getAction();
         JSONObject customData = bundleToJson(notificationData.getCustomData());
+        try {
+            customData = mergeJson(bundleToJson(notificationData.getCustomData()), notificationData.getPushPayloadJSON());
+        } catch (JSONException e) {
+            e.printStackTrace();
+            Logger.e(TAG, "Exception while merging JSON");
+        }
         webView.sendJavascript("javascript:webengage.push.onCallbackReceived( 'click', '" + uri + "'," + customData + ");");
         return false;
     }
@@ -396,25 +421,6 @@ public boolean onInAppNotificationClicked(Context context, InAppNotificationData
         return false;
     }
 
-    @Override
-    public void onGCMRegistered(Context context, String regID) {
-        Logger.d(TAG, regID);
-    }
-
-    @Override
-    public void onGCMMessageReceived(Context context, Intent intent) {
-        Logger.d(TAG, intent.getExtras().toString());
-    }
-
-    @Override
-    public void onAppInstalled(Context context, Intent intent) {
-        Logger.d(TAG + "Install Referrer", intent.getExtras().getString("referrer"));
-    }
-
-    @Override
-    public void onAppUpgraded(Context context, int oldVersion, int newVersion) {
-    }
-
     private static JSONObject bundleToJson(Bundle bundle) {
         if (bundle != null) {
             JSONObject result = new JSONObject();
@@ -472,4 +478,11 @@ private List<Object> toList(JSONArray jsonArray) throws JSONException {
         return list;
     }
 
+    private static JSONObject mergeJson(JSONObject jsonObject1, JSONObject jsonObject2) throws JSONException {
+        for (Iterator<String> it = jsonObject2.keys(); it.hasNext(); ) {
+            String key = it.next();
+            jsonObject1.put(key, jsonObject2.get(key));
+        }
+        return jsonObject1;
+    }
 }

src/ios/WebEngagePlugin.m

@@ -223,18 +223,16 @@ - (void)track:(CDVInvokedUrlCommand *)command {
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
-- (void)screenNavigated:(CDVInvokedUrlCommand *)command {
+- (void)screenNavigated:(CDVInvokedUrlCommand *)command {   
     CDVPluginResult* pluginResult = nil;
     NSString *screenName = command.arguments && command.arguments.count>0 ? [command.arguments objectAtIndex:0] : nil;
 
     if (screenName != nil && screenName.length > 0) {
         id screenData = command.arguments && command.arguments.count>1 ? [command.arguments objectAtIndex:1] : nil;
         if (screenData && [screenData isKindOfClass:[NSDictionary class]]) {
-            [[WebEngage sharedInstance].analytics
-             trackEventWithName:screenName
-             andValue:[self convertISODateStringValuesToNSDate:screenData]];
+            [[WebEngage sharedInstance].analytics navigatingToScreenWithName:screenName andData:[self convertISODateStringValuesToNSDate:screenData]];
         } else {
-            [[WebEngage sharedInstance].analytics trackEventWithName:screenName];
+            [[WebEngage sharedInstance].analytics navigatingToScreenWithName:screenName];
         }
 
         pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];

www/WebEngagePlugin.js

@@ -136,6 +136,11 @@ WebEngageUserChannel.prototype.setAttribute = function(key, value) {
 	}
 };
 
+
+WebEngageUserChannel.prototype.setDevicePushOptIn = function(optIn) {
+	exec(null, null, "WebEngagePlugin", "setDevicePushOptIn", [optIn]);
+};
+
 function isValidJavascriptObject(val) {
 	return val !== undefined && val != null && typeof val === 'object'
 		&& Object.prototype.toString.call(val) === '[object Object]';