trackVerified (#226)

* trackVerified working save for 'error_forbidden' on android

* Remove tmp file

* more logging

* Revert "more logging"

This reverts commit 0b199e8.

* bump iOS SDK version

* update package-lock.json, Cartfile.resolved

---------

Co-authored-by: Nick Patrick <[email protected]>

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

@@ -321,6 +321,40 @@ public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location loc
         }
     }
 
+    @ReactMethod
+    public void trackVerified(final Promise promise) {
+        Radar.trackVerified(new Radar.RadarTrackCallback() {
+            @Override
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarEvent[] events, @Nullable RadarUser user) {
+                if (promise == null) {
+                    return;
+                }
+
+                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()));
+                        }
+                        promise.resolve(map);
+                    } else {
+                        promise.reject(status.toString(), status.toString());
+                    }
+                } catch (JSONException e) {
+                    Log.e(TAG, "JSONException", e);
+                    promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void startTrackingEfficient() {
         Radar.startTracking(RadarTrackingOptions.EFFICIENT);

ios/Cartfile.resolved

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

ios/RNRadar.m

@@ -283,6 +283,34 @@ - (void)didLogMessage:(NSString *)message {
     }
 }
 
+RCT_EXPORT_METHOD(trackVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+        __block RCTPromiseResolveBlock resolver = resolve;
+        __block RCTPromiseRejectBlock rejecter = reject;
+
+       RadarTrackCompletionHandler completionHandler = ^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
+        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"];
+            }
+            resolver(dict);
+        } else if (rejecter) {
+            rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
+        }
+        resolver = nil;
+        rejecter = nil;
+    }; 
+
+    [Radar trackVerifiedWithCompletionHandler:completionHandler];
+}
+
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
     [Radar startTrackingWithOptions:RadarTrackingOptions.presetEfficient];

js/index.native.js

@@ -66,6 +66,10 @@ const trackOnce = options => {
   return NativeModules.RNRadar.trackOnce(backCompatibleOptions)
 };
 
+const trackVerified = () => (
+  NativeModules.RNRadar.trackVerified()
+);
+
 const startTrackingEfficient = () => (
   NativeModules.RNRadar.startTrackingEfficient()
 );
@@ -200,6 +204,7 @@ const Radar = {
   requestPermissions,
   getLocation,
   trackOnce,
+  trackVerified,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,

js/index.web.js

@@ -87,6 +87,10 @@ const trackOnce = options => {
   });
 };
 
+const trackVerified = () => {
+  // not implemented
+};
+
 const startTrackingEfficient = () => {  
   // not implemented
 };
@@ -371,6 +375,7 @@ const Radar = {
   requestPermissions,
   getLocation,
   trackOnce,
+  trackVerified,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,

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.7.2",
+  "version": "3.7.3",
   "main": "js/index.js",
   "files": [
     "android",

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.7.3"
+  s.dependency "RadarSDK", "~> 3.7.7"
 end