should build and fail

radarlabs · Nov 12, 2024 · 2509c79 · 2509c79
1 parent 9260ead
commit 2509c79
Show file tree

Hide file tree

Showing 11 changed files with 457 additions and 117 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,7 +54,8 @@ jobs:
           name: Install Ninja
           command: sudo apt-get update && sudo apt-get install -y ninja-build
       - run: chown -R $USER:$USER android
-      - run: cd android && ./gradlew 
+      - run: cd android && ./gradlew assembleDebug
+
   ios:
     macos:
       xcode: "15.3.0"
@@ -70,7 +71,7 @@ jobs:
           command: npm run install-radar-rebuild-dirty
       - run: cd ios && pod update RadarSDK && pod install
       - run: xcodebuild -workspace ios/Example.xcworkspace -scheme Example -sdk iphonesimulator
- 
+
 
 workflows:
   version: 2

diff --git a/android/src/main/java/io/radar/react/RNRadarModule.java b/android/src/main/java/io/radar/react/RNRadarModule.java
@@ -1115,21 +1115,37 @@ public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress
 
     @ReactMethod
     public void validateAddress(ReadableMap addressMap, final Promise promise) {
-        RadarAddress address = RadarAddress.fromJson(RNRadarUtils.jsonForMap(addressMap));
-        Radar.validateAddress(address, new RadarValidateAddressCallback {
+        if (promise == null) {
+            return;
+        }
+
+        RadarAddress address;
+        try {
+            address = RadarAddress.fromJson(RNRadarUtils.jsonForMap(addressMap));
+        } catch (JSONException e) {
+            promise.reject(Radar.RadarStatus.ERROR_BAD_REQUEST.toString(), Radar.RadarStatus.ERROR_BAD_REQUEST.toString());
+            return;
+        }
+        Radar.validateAddress(address, new Radar.RadarValidateAddressCallback() {
             @Override
-            onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress address, @Nullable RadarAddressVerificationStatus verificationStatus) {
-                if (status == Radar.RadarStatus.SUCCESS && ) {
-                    map.putString("status", status.toString());
-                    if (address != null) {
-                        map.putMap("address", RNRadarUtils.mapForJson(address.toJson()));
-                    }
-                    if (verificationStatus != null) {
-                        map.putString("verificationStatus", verificationStatus.toString());
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress address, @Nullable Radar.RadarAddressVerificationStatus verificationStatus) {
+                if (status == Radar.RadarStatus.SUCCESS) {
+                    try {
+                        WritableMap map = Arguments.createMap();
+                        map.putString("status", status.toString());
+                        if (address != null) {
+                            map.putMap("address", RNRadarUtils.mapForJson(address.toJson()));
+                        }
+                        if (verificationStatus != null) {
+                            map.putString("verificationStatus", verificationStatus.toString());
+                        }
+                        promise.resolve(map);
+                    } catch (JSONException e) {
+                        Log.e(TAG, "JSONException", e);
+                        promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
                     }
-                    promise.resolve(map);
                 } else {
-                    promise.reject(status.toString, status.toString());
+                    promise.reject(status.toString(), status.toString());
                 }
             }
         });

diff --git a/android/src/main/java/io/radar/react/RNRadarReceiver.java b/android/src/main/java/io/radar/react/RNRadarReceiver.java
@@ -45,7 +45,7 @@ public void onEventsReceived(@NonNull Context context, @NonNull RadarEvent[] eve
             WritableMap map = Arguments.createMap();
             map.putArray("events", RNRadarUtils.arrayForJson(RadarEvent.toJson(events)));
             if (user != null) {
-                map.putMap("user", RNRadarUtils.mapForJson(user.toJson()));
+                map.putMap("user", RNRadarUtils.mapForoJson()));
             }
 
             sendEvent("events", map);

diff --git a/example/App.tsx b/example/App.tsx
@@ -1,47 +1,45 @@
 import React, { useState, useEffect } from "react";
-import { StyleSheet, Text, View, ScrollView } from "react-native";
-import Radar, { Map, Autocomplete } from "react-native-radar";
+import { StyleSheet, Text, View, ScrollView, Platform } from "react-native";
+import Radar, { Map, Autocomplete, RadarClientLocationUpdate, RadarLocationUpdate, RadarEventUpdate } from "react-native-radar";
 import MapLibreGL from "@maplibre/maplibre-react-native";
 import ExampleButton from "./components/exampleButton";
 
 // The current version of MapLibre does not support the new react native architecture
 // MapLibreGL.setAccessToken(null);
 
-const stringify = (obj) => JSON.stringify(obj, null, 2);
+const stringify = (obj: any) => JSON.stringify(obj, null, 2);
 
-Radar.on("events", (result) => {
+Radar.on("events", (result: RadarEventUpdate) => {
   console.log("events:", stringify(result));
 });
 
-Radar.on("location", (result) => {
+Radar.on("location", (result: RadarLocationUpdate) => {
   console.log("location:", stringify(result));
 });
 
-Radar.on("clientLocation", (result) => {
+Radar.on("clientLocation", (result: RadarClientLocationUpdate) => {
   console.log("clientLocation:", stringify(result));
 });
 
 Radar.on("error", (err) => {
   console.log("error:", stringify(err));
 });
 
-Radar.on("log", (result) => {
+Radar.on("log", (result: string) => {
   console.log("log:", stringify(result));
 });
 
 export default function App() {
   // add in your test code here!
   const [displayText, setDisplayText] = useState("");
 
-  const handlePopulateText = (displayText) => {
+  const handlePopulateText = (displayText: string) => {
     setDisplayText(displayText);
   };
-
-  const stringify = (obj) => JSON.stringify(obj, null, 2);
   Radar.initialize("prj_test_pk_0000000000000000000000000000000000000000", true);
-  
+
   useEffect(() => {
-    Radar.setLogLevel("info");
+    Radar.setLogLevel("debug");
 
     Radar.setUserId("foo");
 
@@ -57,24 +55,28 @@ export default function App() {
   return (
     <View style={styles.container}>
       {/* The current version of MapLibre does not support the new react native architecture  */}
-      {/* <View style={{ width: "100%", height: "40%" }}>
-       <Map />
-      </View> */}
-      <View style={{ width: "100%", height: "10%" }}>
-        <Autocomplete
-          options={{
-            near: {
-              latitude: 40.7342,
-              longitude: -73.9911,
-            },
-          }}
-        />
-      </View>
-      <View style={{ width: "100%", height: "50%" }}>
-        <ScrollView>
+      {Platform.OS !== "web" &&
+        <>
+          <View style={{ width: "100%", height: "40%" }}>
+            <Map />
+          </View>
+          <View style={{ width: "100%", height: "10%" }}>
+            <Autocomplete
+              options={{
+                near: {
+                  latitude: 40.7342,
+                  longitude: -73.9911,
+                },
+              }}
+            />
+          </View>
+        </>
+      }
+      <View style={{ width: "100%", height: Platform.OS !== "web" ? "50%" : "100%" }}>
+        <ScrollView style={{ height: "25%" }}>
           <Text style={styles.displayText}>{displayText}</Text>
         </ScrollView>
-        <ScrollView>
+        <ScrollView style={{ height: "75%" }}>
           <ExampleButton
             title="getUser"
             onPress={() => {
@@ -186,7 +188,7 @@ export default function App() {
                 .then((result) => {
                   handlePopulateText(
                     "trackOnce manual with location accuracy::" +
-                      stringify(result)
+                    stringify(result)
                   );
                 })
                 .catch((err) => {
@@ -197,7 +199,7 @@ export default function App() {
             }}
           />
           <ExampleButton
-            title="trackOnce manual with beacons:"
+            title="trackOnce manual with beacons"
             onPress={() => {
               Radar.trackOnce({
                 desiredAccuracy: "medium",
@@ -561,6 +563,15 @@ export default function App() {
                 });
             }}
           />
+
+          <ExampleButton
+            title="version"
+            onPress={() => {
+              Radar.nativeSdkVersion().then((nativeVersion) => {
+                handlePopulateText(`sdk: ${Radar.rnSdkVersion()}, native: ${nativeVersion}`);
+              })
+            }}
+          />
         </ScrollView>
       </View>
     </View>
@@ -574,4 +585,7 @@ const styles = StyleSheet.create({
     alignItems: "center",
     justifyContent: "center",
   },
+  displayText: {
+    flex: 1
+  }
 });