react-native-radar 3.5.10 → 3.7.2

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.5.10'
+        versionName '3.7.2'
     }
     lintOptions {
         abortOnError false
@@ -45,5 +45,5 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.5.10'
+    api 'io.radar:sdk:3.7.2'
 }

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -47,9 +47,29 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     private static final int PERMISSIONS_REQUEST_CODE = 20160525; // random request code (Radar's birthday!)
     private Promise mPermissionsRequestPromise;
 
+    private RNRadarReceiver receiver;
+    private int listenerCount = 0;
+
     public RNRadarModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        Radar.setReceiver(new RNRadarReceiver());
+        receiver = new RNRadarReceiver();
+    }
+
+    @ReactMethod
+    public void addListener(String eventName) {
+        if (listenerCount == 0) {
+            receiver.hasListeners = true;
+        }
+
+        listenerCount += 1;
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        listenerCount -= count;
+        if (listenerCount == 0) {
+            receiver.hasListeners = false;
+        }
     }
 
     @Override
@@ -60,6 +80,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     @ReactMethod
     public void initialize(String publishableKey) {
         Radar.initialize(getReactApplicationContext(), publishableKey);
+        Radar.setReceiver(receiver);
     }
 
     @ReactMethod
@@ -127,11 +148,6 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         Radar.setAnonymousTrackingEnabled(enabled);
     }
 
-    @ReactMethod
-    public void setAdIdEnabled(boolean enabled) {
-        Radar.setAdIdEnabled(enabled);
-    }
-
     @ReactMethod
     public void getPermissionsStatus(final Promise promise) {
         if (promise == null) {
@@ -1093,27 +1109,31 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void sendEvent(String customType, ReadableMap metadata, final Promise promise) throws JSONException  {
+    public void logConversion(ReadableMap optionsMap, final Promise promise) throws JSONException  {
         if (promise == null) {
             return;
         }
+
+        if (!optionsMap.hasKey("name")) {
+            promise.reject(Radar.RadarStatus.ERROR_BAD_REQUEST.toString(), Radar.RadarStatus.ERROR_BAD_REQUEST.toString());
+
+            return;
+        }
+
+        String name = optionsMap.getString("name");
+        Double revenue = optionsMap.hasKey("revenue") ? new Double(optionsMap.getDouble("revenue")) : null;
+        ReadableMap metadata = optionsMap.hasKey("metadata") ? optionsMap.getMap("metadata") : null;
         
         JSONObject metadataObj = RNRadarUtils.jsonForMap(metadata);
-        Radar.sendEvent(customType, metadataObj, new Radar.RadarSendEventCallback() {
+        Radar.RadarLogConversionCallback callback = new Radar.RadarLogConversionCallback() {
             @Override
-            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarEvent[] events, @Nullable RadarUser user) {
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarEvent event) {
                 try {
                     if (status == Radar.RadarStatus.SUCCESS) {
                         WritableMap map = Arguments.createMap();
                         map.putString("status", status.toString());
-                        if (location != null) {
-                            map.putMap("location", RNRadarUtils.mapForJson(Radar.jsonForLocation(location)));
-                        }
-                        if (events != null) {
-                            map.putArray("events", RNRadarUtils.arrayForJson(RadarEvent.toJson(events)));
-                        }
-                        if (user != null) {
-                            map.putMap("user", RNRadarUtils.mapForJson(user.toJson()));
+                        if (event != null) {
+                            map.putMap("event", RNRadarUtils.mapForJson(event.toJson()));
                         }
                         promise.resolve(map);
                     } else {
@@ -1124,7 +1144,13 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
                     promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
                 }
             }
-        });
+        };
+
+        if (revenue != null) {
+            Radar.logConversion(name, revenue, metadataObj, callback);
+        } else {
+            Radar.logConversion(name, metadataObj, callback);
+        }
     }
 
 }

package/android/src/main/java/io/radar/react/RNRadarReceiver.java

@@ -12,6 +12,7 @@ import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
@@ -25,11 +26,12 @@ public class RNRadarReceiver extends RadarReceiver {
 
     private ReactNativeHost reactNativeHost;
     private static final String TAG = "RNRadarReceiver";
+    protected boolean hasListeners = false;
 
     private void sendEvent(final String eventName, final Object data) {
         final ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
         ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-        if (reactContext != null) {
+        if (reactContext != null && hasListeners) {
             reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
         }
     }

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.5.10"
+github "radarlabs/radar-sdk-ios" "3.7.3"

package/ios/RNRadar.m

@@ -139,10 +139,6 @@ RCT_EXPORT_METHOD(setAnonymousTrackingEnabled:(BOOL)enabled) {
     [Radar setAnonymousTrackingEnabled:enabled];
 }
 
-RCT_EXPORT_METHOD(setAdIdEnabled:(BOOL)enabled) {
-    [Radar setAdIdEnabled:enabled];
-}
-
 RCT_REMAP_METHOD(getPermissionsStatus, getPermissionsStatusWithResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
     NSString *statusStr;
@@ -969,22 +965,35 @@ RCT_EXPORT_METHOD(getMatrix:(NSDictionary *)optionsDict resolve:(RCTPromiseResol
     }];
 }
 
-RCT_EXPORT_METHOD(sendEvent:(NSString*) customType metadata:(NSDictionary *)metadata resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(logConversion:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    if (optionsDict == nil) {
+        if (reject) {
+            reject([Radar stringForStatus:RadarStatusErrorBadRequest], [Radar stringForStatus:RadarStatusErrorBadRequest], nil);
+        }
+
+        return;
+    }
+
+    NSString *name = optionsDict[@"name"];
+    NSNumber *revenue = optionsDict[@"revenue"];
+    NSDictionary *metadata = optionsDict[@"metadata"];
+    if (name == nil) {
+        if (reject) {
+            reject([Radar stringForStatus:RadarStatusErrorBadRequest], [Radar stringForStatus:RadarStatusErrorBadRequest], nil);
+        }
+
+        return;
+    }
+    
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
-    
-    [Radar sendEvent:customType withMetadata:metadata completionHandler:^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
+
+    RadarLogConversionCompletionHandler completionHandler = ^(RadarStatus status, RadarEvent * _Nullable event) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
-            if (location) {
-                [dict setObject:[Radar dictionaryForLocation:location] forKey:@"location"];
-            }
-            if (events) {
-                [dict setObject:[RadarEvent arrayForEvents:events] forKey:@"events"];
-            }
-            if (user) {
-                [dict setObject:[user dictionaryValue] forKey:@"user"];
+            if (event) {
+                [dict setObject:[event dictionaryValue] forKey:@"event"];
             }
             resolver(dict);
         } else if (rejecter) {
@@ -992,6 +1001,12 @@ RCT_EXPORT_METHOD(sendEvent:(NSString*) customType metadata:(NSDictionary *)meta
         }
         resolver = nil;
         rejecter = nil;
-    }];
+    };
+    
+    if (revenue) {
+        [Radar logConversionWithName:name metadata:metadata completionHandler:completionHandler];
+    } else {
+        [Radar logConversionWithName:name revenue:revenue metadata:metadata completionHandler:completionHandler];
+    }
 }
 @end

package/js/index.native.js

@@ -42,10 +42,6 @@ const setAnonymousTrackingEnabled = (enabled) => (
   NativeModules.RNRadar.setAnonymousTrackingEnabled(enabled)
 )
 
-const setAdIdEnabled = (enabled) => (
-  NativeModules.RNRadar.setAdIdEnabled(enabled)
-)
-
 const getPermissionsStatus = () => (
   NativeModules.RNRadar.getPermissionsStatus()
 );
@@ -170,8 +166,12 @@ const getMatrix = options => (
   NativeModules.RNRadar.getMatrix(options)
 );
 
-const sendEvent = (customType, metadata) => (
-  NativeModules.RNRadar.sendEvent(customType, metadata)
+const logConversion = options => (
+  NativeModules.RNRadar.logConversion(options)
+)
+
+const sendEvent = (name, metadata) => (
+  NativeModules.RNRadar.sendEvent(name, metadata)
 )
 
 const on = (event, callback) => (
@@ -196,7 +196,6 @@ const Radar = {
   setMetadata,
   getMetadata,
   setAnonymousTrackingEnabled,
-  setAdIdEnabled,
   getPermissionsStatus,
   requestPermissions,
   getLocation,
@@ -226,6 +225,7 @@ const Radar = {
   ipGeocode,
   getDistance,
   getMatrix,
+  logConversion,
   sendEvent,
   on,
   off,

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.5.10",
+  "version": "3.7.2",
   "main": "js/index.js",
   "files": [
     "android",
@@ -58,7 +58,8 @@
     "url": "https://github.com/radarlabs/react-native-radar.git"
   },
   "dependencies": {
-    "radar-sdk-js": "^3.5.0",
-    "@react-native-community/netinfo": "^7.1.3"
+    "@babel/runtime": "^7.21.0",
+    "@react-native-community/netinfo": "^7.1.3",
+    "radar-sdk-js": "^3.6.0"
   }
 }

package/react-native-radar.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "~> 3.5.10"
+  s.dependency "RadarSDK", "~> 3.7.3"
 end