@metrixorg/cordova-plugin 1.5.0 → 2.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@metrixorg/cordova-plugin",
-    "version": "1.5.0",
+    "version": "2.6.0",
     "description": "Metrix SDK plugin for Cordova",
     "author": "Metrix",
     "license": "Apache 2.0 License",

package/plugin.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    id="ir.metrix.cordova" version="1.5.0" >
+    id="ir.metrix.cordova" version="2.6.0" >
     <name>Metrix</name>
     <description>Metrix SDK plugin for Cordova</description>
     <author>Metrix</author>
@@ -27,6 +27,7 @@
 
         <source-file src="src/android/MetrixCordova.java" target-dir="src/ir/metrix/cordova" />
         <source-file src="src/android/MetrixCordovaUtils.java" target-dir="src/ir/metrix/cordova" />
+        <source-file src="src/android/Reflection.java" target-dir="src/ir/metrix/cordova" />
 
         <framework src="src/android/metrix.gradle" custom="true" type="gradleReference"/>
     </platform>
@@ -47,7 +48,7 @@
                 <source url="https://cdn.cocoapods.org/"/>
             </config>
             <pods>
-                <pod name="Metrix/cordova" spec="2.0.3" />
+                <pod name="Metrix/cordova" spec="2.1.0" />
             </pods>
         </podspec>
         

package/src/android/MetrixCordova.java

@@ -11,10 +11,21 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import android.os.Bundle;
+import android.Reflection;
 import android.app.Application;
+
 import static ir.metrix.cordova.MetrixCordovaUtils.*;
-import ir.metrix.AttributionData;
-import ir.metrix.messaging.RevenueCurrency;
+import static ir.metrix.cordova.Reflection.*;
+
+import ir.metrix.analytics.SessionIdListener;
+import ir.metrix.analytics.SessionNumberListener;
+import ir.metrix.analytics.messaging.MessageChannel;
+import ir.metrix.analytics.messaging.RevenueCurrency;
+import ir.metrix.analytics.messaging.UserGender;
+import ir.metrix.attribution.AttributionData;
+import ir.metrix.attribution.OnAttributionChangeListener;
+import ir.metrix.attribution.OnDeeplinkResponseListener;
+import ir.metrix.attribution.UserIdListener;
 
 public class MetrixCordova extends CordovaPlugin {
 
@@ -28,76 +39,84 @@ public class MetrixCordova extends CordovaPlugin {
     @Override
     public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
         if (action.equals(COMMAND_INITIALIZE) || 
-                action.equals(COMMAND_SET_STORE) || 
-                action.equals(COMMAND_SET_APP_SECRET) || 
                 action.equals(COMMAND_SET_DEFAULT_TRACKER)) {
         } else if (action.equals(COMMAND_SET_ATTRIBUTION_CHANGE_LISTENER)) {
             attributionCallbackContext = callbackContext;
             setAttributionListener();
-        } else if (action.equals(COMMAND_SET_PUSH_TOKEN)) {
-            String token = args.getString(0);
-            ir.metrix.Metrix.setPushToken(token);
-        } else if (action.equals(COMMAND_GET_SESSION_NUMBER)) {
-            sessionNumberCallbackContext = callbackContext;
-            setSessionNumberListener();
-        } else if (action.equals(COMMAND_TRACK_SIMPLE_EVENT)) {
-            String slug = args.getString(0);
-            ir.metrix.Metrix.newEvent(slug);
-        } else if (action.equals(COMMAND_TRACK_CUSTOM_EVENT)) {
-            sendCustomEvent(args);
-        } else if (action.equals(COMMAND_TRACK_SIMPLE_REVENUE)) {
-            trackSimpleRevenue(args);
-        } else if (action.equals(COMMAND_TRACK_FULL_REVENUE)) {
-            trackFullRevenue(args);
-        } else if (action.equals(COMMAND_SET_DEEPLINK_RESPONSE_CALLBACK)) {
-            deeplinkCallbackContext = callbackContext;
-            setDeeplinkListener();
-        } else if (action.equals(COMMAND_ADD_USER_DEFAULT_ATTRIBUTES)) {
-            addUserAttributes(args);
         } else if (action.equals(COMMAND_SET_USER_ID_LISTENER)) {
             userIdCallbackContext = callbackContext;
             setUserIdListener();
-        } else if (action.equals(COMMAND_GET_SESSION_ID)) {
+        } else if (action.equals(COMMAND_SET_SESSION_ID_LISTENER)) {
             sessionIdCallbackContext = callbackContext;
             setSessionIdListener();
+        } else if (action.equals(COMMAND_SET_SESSION_NUMBER_LISTENER)) {
+            sessionNumberCallbackContext = callbackContext;
+            setSessionNumberListener();
+        } else if (action.equals(COMMAND_SET_DEEPLINK_RESPONSE_LISTENER)) {
+            deeplinkCallbackContext = callbackContext;
+            setDeeplinkListener();
         } else if (action.equals(COMMAND_SET_SHOULD_LAUNCH_DEEPLINK)) {
             shouldLaunchDeeplink = args.getBoolean(0);
+        } else if (action.equals(COMMAND_SET_SIGNATURE)) {
+            setSignature(args);
+        } else if (action.equals(COMMAND_SET_DEFAULT_TRACKER)) {
+            setDefaultTracker(args);
+        } else if (action.equals(COMMAND_SET_STORE)) {
+            setStore(args);
+        } else if (action.equals(COMMAND_TRACK_SIMPLE_EVENT)) {
+            sendSimpleEvent(args);
+        } else if (action.equals(COMMAND_TRACK_CUSTOM_EVENT)) {
+            sendCustomEvent(args);
+        } else if (action.equals(COMMAND_TRACK_REVENUE)) {
+            trackRevenue(args);
+        } else if (action.equals(COMMAND_TRACK_REVENUE_BY_NAME)) {
+            trackRevenueByName(args);
+        } else if (action.equals(COMMAND_SET_USER_ATTRIBUTES)) {
+            setUserAttributes(args);
+        } else if (action.equals(COMMAND_SET_USER_CUSTOM_ID)) {
+            setUserCustomId(args);
+        } else if (action.equals(COMMAND_DELETE_USER_CUSTOM_ID)) {
+            deleteUserCustomId();
+        } else if (action.equals(COMMAND_SET_USER_FIRST_NAME)) {
+            setUserFirstName(args);
+        } else if (action.equals(COMMAND_SET_USER_LAST_NAME)) {
+            setUserLastName(args);
+        } else if (action.equals(COMMAND_SET_USER_PHONE_NUMBER)) {
+            setUserPhoneNumber(args);
+        } else if (action.equals(COMMAND_SET_USER_HASHED_PHONEN_NUMBER)) {
+            setUserHashedPhoneNumber(args);
+        } else if (action.equals(COMMAND_SET_USER_EMAIL)) {
+            setUserEmail(args);
+        } else if (action.equals(COMMAND_SET_USER_HASHED_EMAIL)) {
+            setUserHashedEmail(args);
+        } else if (action.equals(COMMAND_SET_USER_COUNTRY)) {
+            setUserCountry(args);
+        } else if (action.equals(COMMAND_SET_USER_CITY)) {
+            setUserCity(args);
+        } else if (action.equals(COMMAND_SET_USER_REGION)) {
+            setUserRegion(args);
+        } else if (action.equals(COMMAND_SET_USER_LOCALITY)) {
+            setUserLocality(args);
+        } else if (action.equals(COMMAND_SET_USER_GENDER)) {
+            setUserGender(args);
+        } else if (action.equals(COMMAND_SET_USER_BIRTHDAY)) {
+            setUserBirthday(args);
+        } else if (action.equals(COMMAND_SET_USER_CHANNEL_ENABLED)) {
+            userChannelEnabled(args);
+        } else if (action.equals(COMMAND_SET_USER_CHANNEL_DISABLED)) {
+            userChannelDisabled(args);
+        } else if (action.equals(COMMAND_LOADL_IN_APP_MESSAGES)) {
+            loadInAppMessages();
         } else {
             callbackContext.error("\"" + action + "\" is not a recognized action.");
             return false;
         }
         return true;
     }
-
-    private void setSessionNumberListener() {
-        if (sessionNumberCallbackContext != null) {
-            ir.metrix.Metrix.setSessionNumberListener(new ir.metrix.session.SessionNumberListener() {
-                @Override
-                public void onSessionNumberChanged(int sessionNum) {
-                    PluginResult pluginResult = new PluginResult(Status.OK, sessionNum);
-                    pluginResult.setKeepCallback(true);
-                    sessionNumberCallbackContext.sendPluginResult(pluginResult);
-                }
-            });
-        }
-    }
-
-    private void setSessionIdListener() {
-        if (sessionIdCallbackContext != null) {
-            ir.metrix.Metrix.setSessionIdListener(new ir.metrix.session.SessionIdListener() {
-                @Override
-                public void onSessionIdChanged(String sessionId) {
-                    PluginResult pluginResult = new PluginResult(Status.OK, sessionId);
-                    pluginResult.setKeepCallback(true);
-                    sessionIdCallbackContext.sendPluginResult(pluginResult);
-                }
-            });
-        }
-    }
  
     private void setAttributionListener() {
         if (attributionCallbackContext != null) {
-            ir.metrix.Metrix.setOnAttributionChangedListener(new ir.metrix.OnAttributionChangeListener() {
+            ir.metrix.attribution.MetrixAttribution.setOnAttributionChangedListener(new OnAttributionChangeListener() {
                 @Override
                 public void onAttributionChanged(AttributionData attributionData) {
                     JSONObject attributionJsonData = new JSONObject(getAttributionMap(attributionData));
@@ -111,7 +130,7 @@ public class MetrixCordova extends CordovaPlugin {
  
     private void setUserIdListener() {
         if (userIdCallbackContext != null) {
-            ir.metrix.Metrix.setUserIdListener(new ir.metrix.UserIdListener() {
+            ir.metrix.attribution.MetrixAttribution.setUserIdListener(new UserIdListener() {
                 @Override
                 public void onUserIdReceived(String metrixUserId) {
                     PluginResult pluginResult = new PluginResult(Status.OK, metrixUserId);
@@ -124,7 +143,7 @@ public class MetrixCordova extends CordovaPlugin {
  
     private void setDeeplinkListener() {
         if (deeplinkCallbackContext != null) {
-            ir.metrix.Metrix.setOnDeeplinkResponseListener(new ir.metrix.OnDeeplinkResponseListener() {
+            ir.metrix.attribution.MetrixAttribution.setOnDeeplinkResponseListener(new OnDeeplinkResponseListener() {
                 @Override
                 public boolean launchReceivedDeeplink(Uri deeplink) {
                     PluginResult pluginResult = new PluginResult(Status.OK, deeplink.toString());
@@ -136,32 +155,174 @@ public class MetrixCordova extends CordovaPlugin {
             });
         }
     }
+
+    private void setSessionNumberListener() {
+        if (sessionNumberCallbackContext != null) {
+            ir.metrix.analytics.MetrixAnalytics.setSessionNumberListener(new SessionNumberListener() {
+                @Override
+                public void onSessionNumberChanged(int sessionNum) {
+                    PluginResult pluginResult = new PluginResult(Status.OK, sessionNum);
+                    pluginResult.setKeepCallback(true);
+                    sessionNumberCallbackContext.sendPluginResult(pluginResult);
+                }
+            });
+        }
+    }
+
+    private void setSessionIdListener() {
+        if (sessionIdCallbackContext != null) {
+            ir.metrix.analytics.MetrixAnalytics.setSessionIdListener(new SessionIdListener() {
+                @Override
+                public void onSessionIdChanged(String sessionId) {
+                    PluginResult pluginResult = new PluginResult(Status.OK, sessionId);
+                    pluginResult.setKeepCallback(true);
+                    sessionIdCallbackContext.sendPluginResult(pluginResult);
+                }
+            });
+        }
+    }
+
+    private void setSignature(final JSONArray args) throws JSONException {
+        String signature = args.getString(0);
+        ir.metrix.attribution.MetrixAttribution.setSignature(signature);
+    }
+
+    private void setDefaultTracker(final JSONArray args) throws JSONException {
+        String trackerToken = args.getString(0);
+        ir.metrix.attribution.MetrixAttribution.setDefaultTracker(trackerToken);
+    }
+
+    private void setStore(final JSONArray args) throws JSONException {
+        String store = args.getString(0);
+        ir.metrix.attribution.MetrixAttribution.setStore(store);
+    }
+ 
+    private void sendSimpleEvent(final JSONArray args) throws JSONException {
+        String slug = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.newEvent(slug);
+    }
+ 
+    private void sendSimpleEventByName(final JSONArray args) throws JSONException {
+        String name = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.newEventByName(name);
+    }
  
     private void sendCustomEvent(final JSONArray args) throws JSONException {
         String slug = args.getString(0);
         String attributesJson = args.getString(1);
-        Map<String, String> attributes = jsonObjectToStringMap(new JSONObject(attributesJson));
-        ir.metrix.Metrix.newEvent(slug, attributes);
+        Map<String, Object> attributes = jsonObjectToObjectMap(new JSONObject(attributesJson));
+        ir.metrix.analytics.MetrixAnalytics.newEvent(slug, attributes);
     }
-
-    private void addUserAttributes(final JSONArray args) throws JSONException {
-        String attributesJson = args.getString(0);
-        Map<String, String> attributes = jsonObjectToStringMap(new JSONObject(attributesJson));
-        ir.metrix.Metrix.addUserAttributes(attributes);
+ 
+    private void sendCustomEventByName(final JSONArray args) throws JSONException {
+        String name = args.getString(0);
+        String attributesJson = args.getString(1);
+        Map<String, Object> attributes = jsonObjectToObjectMap(new JSONObject(attributesJson));
+        ir.metrix.analytics.MetrixAnalytics.newEventByName(name, attributes);
     }
 
-    private void trackSimpleRevenue(final JSONArray args) throws JSONException {
+    private void trackRevenue(final JSONArray args) throws JSONException {
         String slug = args.getString(0);
         Double amount = args.getDouble(1);
         RevenueCurrency currency = RevenueCurrency.valueOf(args.getString(2));
-        ir.metrix.Metrix.newRevenue(slug, amount, currency);
+        ir.metrix.analytics.MetrixAnalytics.newRevenue(slug, amount, currency);
     }
 
-    private void trackFullRevenue(final JSONArray args) throws JSONException {
-        String slug = args.getString(0);
+    private void trackRevenueByName(final JSONArray args) throws JSONException {
+        String name = args.getString(0);
         Double amount = args.getDouble(1);
         RevenueCurrency currency = RevenueCurrency.valueOf(args.getString(2));
-        String orderId = args.getString(3);
-        ir.metrix.Metrix.newRevenue(slug, amount, currency, orderId);
+        ir.metrix.analytics.MetrixAnalytics.newRevenueByName(name, amount, currency);
+    }
+
+    private void setUserAttributes(final JSONArray args) throws JSONException {
+        String attributesJson = args.getString(0);
+        Map<String, Object> attributes = jsonObjectToObjectMap(new JSONObject(attributesJson));
+        for (Map.Entry<String, Object> entry : attributes.entrySet()) {
+            ir.metrix.analytics.MetrixAnalytics.User.setCustomAttribute(entry.getKey(), entry.getValue());
+        }
+    }
+    
+    private void setUserCustomId(final JSONArray args) throws JSONException {
+        String id = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setUserCustomId(id);
+    }
+
+    private void deleteUserCustomId() {
+        ir.metrix.analytics.MetrixAnalytics.User.deleteUserCustomId();
+    }
+
+    private void setUserFirstName(final JSONArray args) throws JSONException {
+        String firstName = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setFirstName(firstName);
+    }
+
+    private void setUserLastName(final JSONArray args) throws JSONException {
+        String lastName = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setLastName(lastName);
+    }
+
+    private void setUserPhoneNumber(final JSONArray args) throws JSONException {
+        String phoneNumber = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setPhoneNumber(phoneNumber);
+    }
+
+    private void setUserHashedPhoneNumber(final JSONArray args) throws JSONException {
+        String hashedPhoneNumber = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setHashedPhoneNumber(hashedPhoneNumber);
+    }
+
+    private void setUserEmail(final JSONArray args) throws JSONException {
+        String email = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setEmail(email);
+    }
+
+    private void setUserHashedEmail(final JSONArray args) throws JSONException {
+        String hashedEmail = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setHashedEmail(hashedEmail);
+    }
+
+    private void setUserCountry(final JSONArray args) throws JSONException {
+        String country = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setCountry(country);
+    }
+
+    private void setUserCity(final JSONArray args) throws JSONException {
+        String city = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setCity(city);
+    }
+
+    private void setUserRegion(final JSONArray args) throws JSONException {
+        String region = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setRegion(region);
+    }
+
+    private void setUserLocality(final JSONArray args) throws JSONException {
+        String locality = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setLocality(locality);
+    }
+
+    private void setUserGender(final JSONArray args) throws JSONException {
+        String gender = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setGender(UserGender.valueOf(gender));
+    }
+
+    private void setUserBirthday(final JSONArray args) throws JSONException {
+        double birthday = args.getDouble(0);
+        ir.metrix.analytics.MetrixAnalytics.User.setBirthday(Double.valueOf(birthday).longValue());
+    }
+
+    private void userChannelEnabled(final JSONArray args) throws JSONException {
+        String channel = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.channelEnabled(MessageChannel.valueOf(channel));
+    }
+
+    private void userChannelDisabled(final JSONArray args) throws JSONException {
+        String channel = args.getString(0);
+        ir.metrix.analytics.MetrixAnalytics.User.channelDisabled(MessageChannel.valueOf(channel));
+    }
+
+    private void loadInAppMessages() {
+        invokeStaticMethod("ir.metrix.notification.MetrixNotification", "loadInAppMessages");
     }
 }

package/src/android/MetrixCordovaUtils.java

@@ -11,31 +11,51 @@ import ir.metrix.AttributionData;
 public class MetrixCordovaUtils {
     // iOS only
     public static final String COMMAND_INITIALIZE = "initialize";
-    public static final String COMMAND_SET_STORE = "seStore";
     public static final String COMMAND_SET_APP_SECRET = "setAppSecret";
-    public static final String COMMAND_SET_DEFAULT_TRACKER = "setDefaultTracker";
 
-    public static final String COMMAND_SET_PUSH_TOKEN = "setPushToken";
+    public static final String COMMAND_SET_USER_ID_LISTENER = "setUserIdListener";
     public static final String COMMAND_SET_ATTRIBUTION_CHANGE_LISTENER = "setAttributionChangeListener";
-    public static final String COMMAND_GET_SESSION_NUMBER = "setSessionNumberListener";
+    public static final String COMMAND_SET_DEEPLINK_RESPONSE_LISTENER = "setDeeplinkResponseListener";
+    public static final String COMMAND_SET_SHOULD_LAUNCH_DEEPLINK = "setShouldLaunchDeeplink";
+    public static final String COMMAND_SET_SESSION_NUMBER_LISTENER = "setSessionNumberListener";
+    public static final String COMMAND_SET_SESSION_ID_LISTENER = "setSessionIdListener";
+    public static final String COMMAND_SET_STORE = "setStore";
+    public static final String COMMAND_SET_DEFAULT_TRACKER = "setDefaultTracker";
+    public static final String COMMAND_SET_SIGNATURE = "setSignature";
     public static final String COMMAND_TRACK_SIMPLE_EVENT = "trackSimpleEvent";
+    public static final String COMMAND_TRACK_SIMPLE_EVENT_BY_NAME = "trackSimpleEventByName";
     public static final String COMMAND_TRACK_CUSTOM_EVENT = "trackCustomEvent";
-    public static final String COMMAND_TRACK_FULL_REVENUE = "trackFullRevenue";
-    public static final String COMMAND_TRACK_SIMPLE_REVENUE = "trackSimpleRevenue";
-    public static final String COMMAND_ADD_USER_DEFAULT_ATTRIBUTES = "addUserDefaultAttributes";
-    public static final String COMMAND_SET_DEEPLINK_RESPONSE_CALLBACK = "setDeeplinkResponseListener";
-    public static final String COMMAND_SET_USER_ID_LISTENER = "setUserIdListener";
-    public static final String COMMAND_GET_SESSION_ID = "setSessionIdListener";
-    public static final String COMMAND_SET_SHOULD_LAUNCH_DEEPLINK = "setShouldLaunchDeeplink";
+    public static final String COMMAND_TRACK_CUSTOM_EVENT_BY_NAME = "trackCustomEventByName";
+    public static final String COMMAND_TRACK_REVENUE = "trackRevenue";
+    public static final String COMMAND_TRACK_REVENUE_BY_NAME = "trackRevenueByName";
+    public static final String COMMAND_SET_USER_ATTRIBUTES = "setUserAttributes";
+    public static final String COMMAND_SET_USER_CUSTOM_ID = "setUserCustomId";
+    public static final String COMMAND_DELETE_USER_CUSTOM_ID = "deleteUserCustomId";
+    public static final String COMMAND_SET_USER_FIRST_NAME = "setUserFirstName";
+    public static final String COMMAND_SET_USER_LAST_NAME = "setUserLastName";
+    public static final String COMMAND_SET_USER_PHONE_NUMBER = "setUserPhoneNumber";
+    public static final String COMMAND_SET_USER_HASHED_PHONEN_NUMBER = "setUserHashedPhoneNumber";
+    public static final String COMMAND_SET_USER_EMAIL = "setUserEmail";
+    public static final String COMMAND_SET_USER_HASHED_EMAIL = "setUserHashedEmail";
+    public static final String COMMAND_SET_USER_COUNTRY = "setUserCountry";
+    public static final String COMMAND_SET_USER_CITY = "setUserCity";
+    public static final String COMMAND_SET_USER_REGION = "setUserRegion";
+    public static final String COMMAND_SET_USER_LOCALITY = "setUserLocality";
+    public static final String COMMAND_SET_USER_GENDER = "setUserGender";
+    public static final String COMMAND_SET_USER_BIRTHDAY = "setUserBirthday";
+    public static final String COMMAND_SET_USER_CHANNEL_ENABLED = "setUserChannelEnabled";
+    public static final String COMMAND_SET_USER_CHANNEL_DISABLED = "setUserChannelDisabled";
+    public static final String COMMAND_LOADL_IN_APP_MESSAGES = "loadInAppMessages";
+    
 
-    public static Map<String, String> jsonObjectToStringMap(JSONObject jsonObject) throws JSONException {
-        Map<String, String> map = new HashMap<String, String>(jsonObject.length());
+    public static Map<String, Object> jsonObjectToObjectMap(JSONObject jsonObject) throws JSONException {
+        Map<String, Object> map = new HashMap<String, Object>(jsonObject.length());
         @SuppressWarnings("unchecked")
         Iterator<String> jsonObjectIterator = jsonObject.keys();
 
         while (jsonObjectIterator.hasNext()) {
             String key = jsonObjectIterator.next();
-            map.put(key, jsonObject.get(key).toString());
+            map.put(key, jsonObject.get(key));
         }
 
         return map;
@@ -55,6 +75,9 @@ public class MetrixCordovaUtils {
         if (AttributionData.getAcquisitionSource() != null) {
             map.put("acquisitionSource", AttributionData.getAcquisitionSource());
         }
+        if (AttributionData.getAcquisitionSubId() != null) {
+            map.put("acquisitionSubId", AttributionData.getAcquisitionSubId());
+        }
         if (AttributionData.getAttributionStatus() != null) {
             map.put("attributionStatus", AttributionData.getAttributionStatus().name());
         }

package/src/android/Reflection.java

@@ -0,0 +1,16 @@
+package ir.metrix.cordova;
+
+import java.lang.reflect.Method;
+
+public class Reflection {
+
+    public static Object invokeStaticMethod(String className, String methodName) {
+        try {
+            Class<?> clazz = Class.forName(className);
+            Method method = clazz.getDeclaredMethod(methodName);
+            return method.invoke(null);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

package/src/android/metrix.gradle

@@ -1,7 +1,18 @@
+def Properties gradleProperties = new Properties()
+gradleProperties.load(rootProject.rootProject.file("gradle.properties").newDataInputStream())
+
+project.ext {
+    notificationEnabled = gradleProperties.getProperty("metrix.notitifcation.enable", "false").toBoolean()
+}
+
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation 'ir.metrix:metrix-cordova:1.4.0'
+    implementation 'ir.metrix.analytics:metrix-cordova:2.6.0'
+    implementation 'ir.metrix.attribution:metrix-cordova:2.6.0'
+    if (project.ext.notificationEnabled) {
+        api 'ir.metrix.notification:metrix-cordova:2.6.0'
+    }
 }

package/src/ios/MetrixCordova.m

@@ -267,6 +267,7 @@ NSString* userIdCallbackId;
     [self addValueOrEmpty:dictionary key:@"acquisitionAdSet" value:data.acquisitionAdSet];
     [self addValueOrEmpty:dictionary key:@"acquisitionCampaign" value:data.acquisitionCampaign];
     [self addValueOrEmpty:dictionary key:@"acquisitionSource" value:data.acquisitionSource];
+    [self addValueOrEmpty:dictionary key:@"acquisitionSubId" value:data.acquisitionSubId];
     [self addValueOrEmpty:dictionary key:@"attributionStatus" value:data.attributionStatusRaw];
     
     return dictionary;;

package/www/metrix.js

@@ -22,6 +22,25 @@ function callCordovaCallback(action, callback) {
 }
 
 var Metrix = {
+
+    setSignature: function(signature) {
+        if (signature) {
+            callCordova('setSignature', signature);
+        }
+    },
+    
+    setDefaultTracker: function(token) {
+        if (token) {
+            callCordova('setDefaultTracker', token);
+        }
+    },
+
+    setStore: function(store) {
+        if (store) {
+            callCordova('setStore', store);
+        }
+    },
+
     newEvent: function(slug, attributes) {
         if(attributes) {
             callCordova('trackCustomEvent', slug, attributes);
@@ -30,11 +49,19 @@ var Metrix = {
         }
     },
 
-    addUserAttributes: function(attributes) {
-        callCordova('addUserDefaultAttributes', attributes);
+    newEventByName: function(name, attributes) {
+        if(attributes) {
+            callCordova('trackCustomEventByName', name, attributes);
+        } else {
+            callCordova('trackSimpleEventByName', name);
+        }
+    },
+
+    setUserAttributes: function(attributes) {
+        callCordova('setUserAttributes', attributes);
     },
 
-    newRevenue: function(slug, amount, currency, orderId) {
+    newRevenue: function(slug, amount, currency) {
         var cr = null;
         if (currency === 0) {
             cr = "IRR";
@@ -45,11 +72,23 @@ var Metrix = {
         } else {
             cr = "IRR";
         }
-        if (orderId) {
-            callCordova('trackFullRevenue', slug, amount, cr, orderId);
+        
+        callCordova('trackRevenue', slug, amount, cr);    
+    },
+
+    newRevenueByName: function(name, amount, currency) {
+        var cr = null;
+        if (currency === 0) {
+            cr = "IRR";
+        } else if (currency === 1) {
+            cr = "USD";
+        } else if (currency === 2) {
+            cr = "EUR";
         } else {
-            callCordova('trackSimpleRevenue', slug, amount, cr);
-        }       
+            cr = "IRR";
+        }
+        
+        callCordova('trackRevenueByName', name, amount, cr);    
     },
 
     setOnAttributionChangedListener: function(callback) {
@@ -77,9 +116,121 @@ var Metrix = {
     },
 
     // android only
-    setPushToken: function(token) {
+    setUserCustomId: function(id) {
         if (token) {
-            callCordova('setPushToken', token);
+            callCordova('setUserCustomId', id);
+        }
+    },
+
+    // android only
+    deleteUserCustomId: function() {
+        if (token) {
+            callCordova('setUserCustomId');
+        }
+    },
+
+    // android only
+    setUserFirstName: function(firstName) {
+        if (token) {
+            callCordova('setUserFirstName', firstName);
+        }
+    },
+
+    // android only
+    setUserLastName: function(lastName) {
+        if (token) {
+            callCordova('setUserLastName', lastName);
+        }
+    },
+
+    // android only
+    setUserPhoneNumber: function(phoneNumber) {
+        if (token) {
+            callCordova('setUserPhoneNumber', phoneNumber);
+        }
+    },
+
+    // android only
+    setUserHashedPhoneNumber: function(hash) {
+        if (token) {
+            callCordova('setUserHashedPhoneNumber', hash);
+        }
+    },
+
+    // android only
+    setUserEmail: function(email) {
+        if (token) {
+            callCordova('setUserEmail', email);
+        }
+    },
+
+    // android only
+    setUserHashedEmail: function(hash) {
+        if (token) {
+            callCordova('setUserHashedEmail', hash);
+        }
+    },
+
+    // android only
+    setUserCountry: function(coutry) {
+        if (token) {
+            callCordova('setUserCountry', coutry);
+        }
+    },
+
+    // android only
+    setUserCity: function(city) {
+        if (token) {
+            callCordova('setUserCity', city);
+        }
+    },
+
+    // android only
+    setUserRegion: function(region) {
+        if (token) {
+            callCordova('setUserRegion', region);
+        }
+    },
+
+    // android only
+    setUserLocality: function(locality) {
+        if (token) {
+            callCordova('setUserLocality', locality);
+        }
+    },
+
+    // android only
+    setUserGender: function(gender) {
+        if (token) {
+            callCordova('setUserGender', gender);
+        }
+    },
+
+    // android only
+    setUserBirthday: function(birthday) {
+        if (token) {
+            callCordova('setUserBirthday', birthday);
+        }
+    },
+
+    // android only
+    setUserChannelEnabled: function(channel) {
+        if (token) {
+            callCordova('setUserChannelEnabled', channel);
+        }
+    },
+
+    // android only
+    setUserChannelDisabled: function(channel) {
+        if (token) {
+            callCordova('setUserChannelDisabled', channel);
+        }
+    },
+
+    // android only
+    loadInAppMessages: function() {
+        if (token) {
+            callCordova('loadInAppMessages');
         }
     },
 
@@ -102,20 +253,6 @@ var Metrix = {
         }
     },
 
-    // iOS only
-    setDefaultTracker: function(token) {
-        if (token) {
-            callCordova('setDefaultTracker', token);
-        }
-    },
-
-    // iOS only
-    setStore: function(store) {
-        if (store) {
-            callCordova('setStore', store);
-        }
-    },
-
     // iOS only
     setAppSecret: function(id, info1, info2, info3, info4) {
         if (id && info1 && info2 && info3 && info4) {