@metrixorg/react-native-plugin 1.2.0-beta08 → 1.2.0-beta12

package/android/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 100200057
-        versionName "1.2.0-beta07"
+        versionCode 100200062
+        versionName "1.2.0-beta12"
     }
 
     buildTypes {
@@ -29,6 +29,6 @@ rootProject.allprojects {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'ir.metrix:metrix-reactnative:1.2.0-beta5'
+    implementation 'ir.metrix:metrix-reactnative:1.2.0-beta7'
 
 }

package/android/src/main/java/ir/metrix/reactnative/MetrixModule.java

@@ -12,6 +12,9 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
+
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
 import android.util.Log;
 
 import java.util.HashMap;
@@ -22,6 +25,8 @@ import ir.metrix.messaging.RevenueCurrency;
 import ir.metrix.OnAttributionChangeListener;
 import ir.metrix.OnDeeplinkResponseListener;
 import ir.metrix.UserIdListener;
+import ir.metrix.session.SessionIdListener;
+import ir.metrix.session.SessionNumberListener;
 
 public class MetrixModule extends ReactContextBaseJavaModule {
 
@@ -94,62 +99,63 @@ public class MetrixModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void getSessionNum(Callback callback) {
-        if (callback != null) {
-            callback.invoke(ir.metrix.Metrix.getSessionNum());
-        }
+    public void setSessionNumberListener() {
+        ir.metrix.Metrix.setSessionNumberListener(
+            new SessionNumberListener() {
+                @Override
+                public void onSessionNumberChanged(int sessionNumber) {
+                    sendStringEvent("onSessionNumberChangedListener", String.valueOf(sessionNumber));
+                }
+            }
+        );
     }
 
     @ReactMethod
-    public void getSessionId(Callback callback) {
-        if (callback != null) {
-            callback.invoke(ir.metrix.Metrix.getSessionId());
-        }
+    public void setSessionIdListener() {
+        ir.metrix.Metrix.setSessionIdListener(
+            new SessionIdListener() {
+                @Override
+                public void onSessionIdChanged(String sessionId) {
+                    sendStringEvent("onSessionIdChangedListener", sessionId);
+                }
+            }
+        );
     }
 
     @ReactMethod
-    public void setOnAttributionChangedListener(final Callback callback) {
-
-        if (callback != null) {
-            ir.metrix.Metrix.setOnAttributionChangedListener(
-                    new OnAttributionChangeListener() {
-                        @Override
-                        public void onAttributionChanged(AttributionData attributionData) {
-                            WritableMap map = getWritableMapFromAttributionModel(attributionData);
-
-                            callback.invoke(map);
-                        }
-                    });
-        }
+    public void setOnAttributionChangedListener() {
+        ir.metrix.Metrix.setOnAttributionChangedListener(
+                new OnAttributionChangeListener() {
+                    @Override
+                    public void onAttributionChanged(AttributionData attributionData) {
+                        WritableMap map = getWritableMapFromAttributionModel(attributionData);
+
+                        sendObjectEvent("onAttributionChangedListener", map);
+                    }
+                });
     }
 
     @ReactMethod
-    public void setUserIdListener(final Callback callback) {
-
-        if (callback != null) {
-            ir.metrix.Metrix.setUserIdListener(
-                    new UserIdListener() {
-                        @Override
-                        public void onUserIdReceived(String userId) {
-                            callback.invoke(userId);
-                        }
-                    });
-        }
+    public void setUserIdListener() {
+        ir.metrix.Metrix.setUserIdListener(
+                new UserIdListener() {
+                    @Override
+                    public void onUserIdReceived(String userId) {
+                        sendStringEvent("onUserIdListener", userId);
+                    }
+                });
     }
 
     @ReactMethod
-    public void setOnDeeplinkResponseListener(final boolean shouldLaunchDeeplink, final Callback callback) {
-
-        if (callback != null) {
-            ir.metrix.Metrix.setOnDeeplinkResponseListener(
-                    new OnDeeplinkResponseListener() {
-                        @Override
-                        public boolean launchReceivedDeeplink(Uri deeplink) {
-                            callback.invoke(deeplink.toString());
-                            return shouldLaunchDeeplink;
-                        }
-                    });
-        }
+    public void setOnDeeplinkResponseListener(final boolean shouldLaunchDeeplink) {
+        ir.metrix.Metrix.setOnDeeplinkResponseListener(
+                new OnDeeplinkResponseListener() {
+                    @Override
+                    public boolean launchReceivedDeeplink(Uri deeplink) {
+                        sendStringEvent("onDeeplinkResponseListener", deeplink.toString());
+                        return shouldLaunchDeeplink;
+                    }
+                });
     }
 
     private WritableMap getWritableMapFromAttributionModel(AttributionData attributionData) {
@@ -177,4 +183,16 @@ public class MetrixModule extends ReactContextBaseJavaModule {
         }
         return map;
     }
+
+    private void sendObjectEvent(String eventName, WritableMap param) {
+        getReactApplicationContext()
+               .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+               .emit(eventName, param);
+    }
+
+    private void sendStringEvent(String eventName, String param) {
+        getReactApplicationContext()
+               .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+               .emit(eventName, param);
+    }
 }

package/index.js

@@ -22,39 +22,29 @@ Metrix.setPushToken = function(token) {
     module_metrix.setPushToken(token);
 };
 
-Metrix.getSessionNum = function(callback) {
-    module_metrix.getSessionNum(callback);
+Metrix.setSessionNumberListener = function(callback) {
+    eventEmitter.addListener('onSessionNumberChangedListener', callback);
+    module_metrix.setSessionNumberListener();
 };
 
-Metrix.getSessionId = function(callback) {
-    module_metrix.getSessionId(callback);
+Metrix.setSessionIdListener = function(callback) {
+    eventEmitter.addListener('onSessionIdChangedListener', callback);
+    module_metrix.setSessionIdListener();
 };
 
 Metrix.setOnAttributionChangedListener = function(callback) {
-    if (Platform.OS === "android") {
-        module_metrix.setOnAttributionChangedListener(callback);
-    } else {
-        eventEmitter.addListener('onAttributionChangedListener', callback);
-        module_metrix.setOnAttributionChangedListener();
-    }
+    eventEmitter.addListener('onAttributionChangedListener', callback);
+    module_metrix.setOnAttributionChangedListener();
 };
 
 Metrix.setOnDeeplinkResponseListener = function(callback) {
-    if (Platform.OS === "android") {
-        module_metrix.setOnDeeplinkResponseListener(this.shouldLaunchDeeplink, callback);
-    } else {
-        eventEmitter.addListener('onDeeplinkResponseListener', callback);
-        module_metrix.setOnDeeplinkResponseListener(this.shouldLaunchDeeplink);
-    }
+    eventEmitter.addListener('onDeeplinkResponseListener', callback);
+    module_metrix.setOnDeeplinkResponseListener(this.shouldLaunchDeeplink);
 };
 
 Metrix.setUserIdListener = function(callback) {
-    if (Platform.OS === "android") {
-        module_metrix.setUserIdListener(callback);
-    } else {
-        eventEmitter.addListener('onUserIdListener', callback);
-        module_metrix.setUserIdListener();
-    }
+    eventEmitter.addListener('onUserIdListener', callback);
+    module_metrix.setUserIdListener();
 };
 
 Metrix.newEvent = function(eventName, customAttributes) {

package/ios/RNMetrixModule.m

@@ -25,7 +25,7 @@ BOOL hasAttributionListener;
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"onAttributionChangedListener", @"onUserIdListener", @"onDeeplinkResponseListener"];
+  return @[@"onAttributionChangedListener", @"onUserIdListener", @"onDeeplinkResponseListener", @"onSessionNumberChangedListener", @"onSessionIdChangedListener"];
 }
 
 RCT_EXPORT_METHOD(initialize:(NSString *)appId) {
@@ -36,14 +36,16 @@ RCT_EXPORT_METHOD(setPushToken:(NSString *)token) {
   [Metrix setPushTokenWithPushToken:token];
 }
 
-RCT_EXPORT_METHOD(getSessionNum:(RCTResponseSenderBlock)callback) {
-  NSInteger sessionNum = [Metrix getSessionNum];
-  callback(@[@(sessionNum)]);
+RCT_EXPORT_METHOD(setSessionNumberListener) {
+    [Metrix setSessionNumberListener:^(NSInteger sessionNumber) {
+        [self sendEventWithName:@"onSessionNumberChangedListener" body:[NSString stringWithFormat: @"%ld", (long)sessionNumber]];
+    }];
 }
 
-RCT_EXPORT_METHOD(getSessionId:(RCTResponseSenderBlock)callback) {
-  NSString *sessionId = [Metrix getSessionId];
-  callback(@[sessionId]);
+RCT_EXPORT_METHOD(setSessionIdListener) {
+    [Metrix setSessionIdListener:^(NSString *sessionId) {
+        [self sendEventWithName:@"onSessionIdChangedListener" body:sessionId];
+    }];
 }
 
 RCT_EXPORT_METHOD(newCustomEvent:(NSString *)eventName attributes:(NSDictionary *)attributes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metrixorg/react-native-plugin",
-  "version": "1.2.0-beta08",
+  "version": "1.2.0-beta12",
   "description": "Metrix React native plugin",
   "main": "index.js",
   "scripts": {

package/react-native-metrix.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.dependency 'React'
 
   # MetrixFramework
-  s.dependency 'Metrix/reactnative', '2.0.0-beta07'
+  s.dependency 'Metrix/reactnative', '2.0.0-beta10'
 end