move types out to separate file so it can be shared with react-native…

.circleci/config.yml

@@ -39,7 +39,7 @@ jobs:
       - run: cd example && npm install
       - run: cd example && ionic build
       - run: cd example && npx cap sync
-      - run: cd example && ionic capacitor run ios --target $(ionic capacitor run ios --list | grep -o -m 1 '[A-F0-9]\{8\}-[A-F0-9]\{4\}-[A-F0-9]\{4\}-[A-F0-9]\{4\}-[A-F0-9]\{12\}')
+      - run: cd example && ionic capacitor run ios --target $(ionic capacitor run ios --list | grep 'iPhone' | grep -o -m 1 '[A-F0-9]\{8\}-[A-F0-9]\{4\}-[A-F0-9]\{4\}-[A-F0-9]\{4\}-[A-F0-9]\{12\}')
 workflows:
   version: 2
   android-ios:

android/src/main/java/io/radar/capacitor/RadarPlugin.java

@@ -170,11 +170,12 @@ public void onTokenUpdated(@NonNull Context context, @NonNull RadarVerifiedLocat
     @PluginMethod()
     public void initialize(PluginCall call) {
         String publishableKey = call.getString("publishableKey");
+        Boolean fraud = call.getBoolean("fraud", false);
         SharedPreferences.Editor editor = this.getContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "Capacitor");
         editor.putString("x_platform_sdk_version", "3.12.0");
         editor.apply();
-        Radar.initialize(this.getContext(), publishableKey);
+        Radar.initialize(this.getContext(), publishableKey, null, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
         call.resolve();
     }
 
@@ -328,7 +329,7 @@ public void onComplete(@NotNull Radar.RadarStatus status, @Nullable Location loc
     }
 
     @PluginMethod()
-    public void trackOnce(final PluginCall call) {
+    public void trackOnce(final PluginCall call) throws JSONException {
         Radar.RadarTrackCallback callback = new Radar.RadarTrackCallback() {
             @Override
             public void onComplete(@NotNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarEvent[] events, @Nullable RadarUser user) {
@@ -345,7 +346,23 @@ public void onComplete(@NotNull Radar.RadarStatus status, @Nullable Location loc
             }
         };
 
-        if (call.hasOption("latitude") && call.hasOption("longitude") && call.hasOption("accuracy")) {
+        if (call.hasOption("location")) {
+            JSObject locationObj = call.getObject("location");
+
+            double latitude = locationObj.getDouble("latitude");
+            double longitude = locationObj.getDouble("longitude");
+            if (!locationObj.has("accuracy")) {
+                call.reject("location accuracy is required");
+                return;
+            }
+            float accuracy = (float)locationObj.getDouble("accuracy");
+            Location location = new Location("RadarSDK");
+            location.setLatitude(latitude);
+            location.setLongitude(longitude);
+            location.setAccuracy(accuracy);
+
+            Radar.trackOnce(location, callback);
+        } else if (call.hasOption("latitude") && call.hasOption("longitude") && call.hasOption("accuracy")) {
             double latitude = call.getDouble("latitude");
             double longitude = call.getDouble("longitude");
             float accuracy = call.getDouble("accuracy").floatValue();

example/src/App.tsx

@@ -81,7 +81,7 @@ class App extends React.Component<AppProps, AppState> {
   }
 
   componentDidMount() {
-    Radar.initialize({ publishableKey: 'prj_test_pk_0000000000000000000000000000000000000000' });
+    Radar.initialize({ publishableKey: 'prj_test_pk_26da2abbdc9c6ffc86afcbc3df0bbde4f8d4e1f8' });
     Radar.setLogLevel({level: 'debug'});
     Radar.setUserId({ userId: 'capacitor' });
     Radar.setDescription({ description: 'capacitor example'});
@@ -123,6 +123,17 @@ class App extends React.Component<AppProps, AppState> {
     }).catch((error) => {
       this.logOutput(`trackOnce: error ${JSON.stringify(error)}\n`);
     });
+    Radar.trackOnce({
+      location: {
+        latitude: 40,
+        longitude: -73,
+        accuracy: 0,
+      }
+    }).then((result) => {
+      this.logOutput(`trackOnce with location: ${JSON.stringify(result)}\n`);
+    }).catch((error) => {
+      this.logOutput(`trackOnce with location: error ${JSON.stringify(error)}\n`);
+    });
     Radar.isTracking().then((result) => {
       this.logOutput(`isTracking: ${JSON.stringify(result)}\n`);
     }).catch((error) => {
@@ -245,8 +256,8 @@ class App extends React.Component<AppProps, AppState> {
 
     Radar.trackVerified().then((result) => {
       this.logOutput(`trackVerified: ${JSON.stringify(result)}\n`);
-      const { user } = result;
-      if (user?.fraud?.passed && user?.country?.allowed && user?.state?.allowed) {
+      const { token } = result;
+      if (token?.passed) {
         // allow access to feature
       } else {
         // deny access to feature, show error message
@@ -335,7 +346,7 @@ class App extends React.Component<AppProps, AppState> {
           destinationGeofenceTag: "store",
           destinationGeofenceExternalId: "123",
           mode: "car",
-          scheduledArrivalAt: scheduledArrivalAt
+          scheduledArrivalAt: scheduledArrivalAt.toISOString(),
         },
         trackingOptions: {
           "desiredStoppedUpdateInterval": 30,

ios/Plugin/Plugin.swift

@@ -252,9 +252,17 @@ public class RadarPlugin: CAPPlugin, RadarDelegate, RadarVerifiedDelegate {
                 }
             }
 
-            let latitude = call.getDouble("latitude") ?? 0.0
-            let longitude = call.getDouble("longitude") ?? 0.0
-            let accuracy = call.getDouble("accuracy") ?? 0.0
+            var latitude = call.getDouble("latitude") ?? 0.0
+            var longitude = call.getDouble("longitude") ?? 0.0
+            var accuracy = call.getDouble("accuracy") ?? 0.0
+
+            let locationDict = call.getObject("location") as? [String:Double] ?? nil
+            if (locationDict != nil) {
+                latitude = locationDict?["latitude"] ?? 0.0
+                longitude = locationDict?["longitude"] ?? 0.0
+                accuracy = locationDict?["accuracy"] ?? 0.0 
+            }
+
             let coordinate = CLLocationCoordinate2DMake(latitude, longitude)
             let location = CLLocation(coordinate: coordinate, altitude: -1, horizontalAccuracy: accuracy, verticalAccuracy: -1, timestamp: Date())
             var accuracyLevel = RadarTrackingOptions.desiredAccuracy(for:"medium")