hypertrack-sdk-react-native 13.2.3 → 13.3.1

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Apr 08 21:33:49 EEST 2024
+gradle.version=7.2

package/android/.idea/gradle.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/local/Cellar/gradle/8.2/libexec" />
+        <option name="gradleJvm" value="jbr-17" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

package/android/.idea/misc.xml

@@ -0,0 +1,9 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

package/android/gradle.properties

@@ -1,3 +1,3 @@
 HyperTrackSdk_kotlinVersion=1.6.21
-HyperTrackSdk_HyperTrackSDKVersion=7.4.3
+HyperTrackSdk_HyperTrackSDKVersion=7.5.3
 android.useAndroidX=true

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Apr 08 21:32:54 EEST 2024
+sdk.dir=/opt/homebrew/share/android-commandlinetools

package/android/src/main/java/com/reactnativehypertracksdk/HyperTrackReactNativePlugin.kt

@@ -10,13 +10,11 @@ import com.reactnativehypertracksdk.common.Serialization.serializeErrors
 import com.reactnativehypertracksdk.common.Serialization.serializeIsAvailable
 import com.reactnativehypertracksdk.common.Serialization.serializeIsTracking
 import com.reactnativehypertracksdk.common.Serialization.serializeLocateResult
-import com.reactnativehypertracksdk.common.Serialization.serializeLocation
 import com.reactnativehypertracksdk.common.Serialization.serializeLocationResult
 
 @ReactModule(name = HyperTrackReactNativePlugin.NAME)
 class HyperTrackReactNativePlugin(reactContext: ReactApplicationContext?) :
     ReactContextBaseJavaModule(reactContext) {
-
     private var locateSubscription: HyperTrack.Cancellable? = null
     private var subscriptions: List<HyperTrack.Cancellable>? = null
 
@@ -66,7 +64,10 @@ class HyperTrackReactNativePlugin(reactContext: ReactApplicationContext?) :
      */
 
     @ReactMethod
-    fun addGeotag(args: ReadableMap, promise: Promise) {
+    fun addGeotag(
+        args: ReadableMap,
+        promise: Promise,
+    ) {
         HyperTrackSdkWrapper.addGeotag(args.toHashMap()).toPromise(promise)
     }
 
@@ -113,9 +114,10 @@ class HyperTrackReactNativePlugin(reactContext: ReactApplicationContext?) :
     @ReactMethod
     fun locate(promise: Promise) {
         locateSubscription?.cancel()
-        locateSubscription = HyperTrack.locate {
-            emitEvent(EVENT_LOCATE, serializeLocateResult(it).toWritableMap())
-        }
+        locateSubscription =
+            HyperTrack.locate {
+                emitEvent(EVENT_LOCATE, serializeLocateResult(it).toWritableMap())
+            }
         Success(Unit).toPromise(promise)
     }
 
@@ -172,14 +174,20 @@ class HyperTrackReactNativePlugin(reactContext: ReactApplicationContext?) :
         }
     }
 
-    private fun emitEvent(event: String, data: WritableMap) {
+    private fun emitEvent(
+        event: String,
+        data: WritableMap,
+    ) {
         reactApplicationContext
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
             .emit(event, data)
     }
 
     @Suppress("SameParameterValue")
-    private fun emitEvent(event: String, data: WritableArray) {
+    private fun emitEvent(
+        event: String,
+        data: WritableArray,
+    ) {
         reactApplicationContext
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
             .emit(event, data)

package/android/src/main/java/com/reactnativehypertracksdk/ReactNativeSerialization.kt

@@ -5,8 +5,8 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.reactnativehypertracksdk.common.Failure
-import com.reactnativehypertracksdk.common.WrapperResult
 import com.reactnativehypertracksdk.common.Success
+import com.reactnativehypertracksdk.common.WrapperResult
 
 @Suppress("UNCHECKED_CAST")
 internal fun <T> WrapperResult<T>.toPromise(promise: Promise) {
@@ -98,7 +98,7 @@ internal fun Map<String, Any?>.toWritableMap(): WritableMap {
                 is Double -> {
                     putDouble(key, value)
                 }
-                
+
                 is Float -> {
                     putDouble(key, value.toDouble())
                 }

package/android/src/main/java/com/reactnativehypertracksdk/common/GeotagData.kt

@@ -1,6 +1,7 @@
 package com.reactnativehypertracksdk.common
 
 import android.location.Location
+import com.hypertrack.sdk.android.HyperTrack
 
 /**
  * The data that represents geotag to create
@@ -9,5 +10,7 @@ import android.location.Location
  */
 internal data class GeotagData(
     val data: Map<String, Any?>,
-    val expectedLocation: Location?
+    val expectedLocation: Location?,
+    val orderHandle: String?,
+    val orderStatus: HyperTrack.OrderStatus?,
 )

package/android/src/main/java/com/reactnativehypertracksdk/common/HyperTrackSdkWrapper.kt

@@ -1,16 +1,14 @@
 package com.reactnativehypertracksdk.common
 
-import com.hypertrack.sdk.*
 import com.hypertrack.sdk.android.HyperTrack
-import com.hypertrack.sdk.android.HyperTrack.metadata
 import com.hypertrack.sdk.android.Json
 import com.hypertrack.sdk.android.Result
 import com.reactnativehypertracksdk.common.Serialization.deserializeDynamicPublishableKey
-import com.reactnativehypertracksdk.common.Serialization.deserializeIsAvailable
-import com.reactnativehypertracksdk.common.Serialization.deserializeName
 import com.reactnativehypertracksdk.common.Serialization.deserializeGeotagData
+import com.reactnativehypertracksdk.common.Serialization.deserializeIsAvailable
 import com.reactnativehypertracksdk.common.Serialization.deserializeIsTracking
 import com.reactnativehypertracksdk.common.Serialization.deserializeMetadata
+import com.reactnativehypertracksdk.common.Serialization.deserializeName
 import com.reactnativehypertracksdk.common.Serialization.serializeDeviceId
 import com.reactnativehypertracksdk.common.Serialization.serializeDynamicPublishableKey
 import com.reactnativehypertracksdk.common.Serialization.serializeErrors
@@ -30,23 +28,36 @@ typealias Serialized = Map<String, Any?>
  * It receives serialized params.
  */
 internal object HyperTrackSdkWrapper {
-
     fun addGeotag(args: Serialized): WrapperResult<Serialized> {
         return deserializeGeotagData(args)
             .flatMapSuccess { geotag ->
                 // TODO: return proper error if JSON is wrong
                 val geotagMetadata = Json.fromMap(geotag.data)!!
-                val expectedLocation = geotag
-                    .expectedLocation
-                    ?.let {
-                        HyperTrack.Location(
-                            latitude = it.latitude,
-                            longitude = it.longitude
+                val expectedLocation =
+                    geotag
+                        .expectedLocation
+                        ?.let {
+                            HyperTrack.Location(
+                                latitude = it.latitude,
+                                longitude = it.longitude,
+                            )
+                        }
+                val orderHandle = geotag.orderHandle
+                val orderStatus = geotag.orderStatus
+                if (expectedLocation != null) {
+                    if (orderHandle != null || orderStatus != null) {
+                        if (orderHandle == null || orderStatus == null) {
+                            throw Error("orderHandle and orderStatus must be provided")
+                        }
+                        HyperTrack.addGeotag(
+                            orderHandle = orderHandle,
+                            orderStatus = orderStatus,
+                            expectedLocation = expectedLocation,
+                            metadata = geotagMetadata,
                         )
+                    } else {
+                        HyperTrack.addGeotag(geotagMetadata, expectedLocation)
                     }
-                if (expectedLocation != null) {
-                    HyperTrack
-                        .addGeotag(geotagMetadata, expectedLocation)
                         .let {
                             when (it) {
                                 is Result.Failure -> {
@@ -59,8 +70,18 @@ internal object HyperTrackSdkWrapper {
                             }
                         }
                 } else {
-                    HyperTrack
-                        .addGeotag(geotagMetadata)
+                    if (orderHandle != null || orderStatus != null) {
+                        if (orderHandle == null || orderStatus == null) {
+                            throw Error("orderHandle and orderStatus must be provided")
+                        }
+                        HyperTrack.addGeotag(
+                            orderHandle = orderHandle,
+                            orderStatus = orderStatus,
+                            metadata = geotagMetadata,
+                        )
+                    } else {
+                        HyperTrack.addGeotag(geotagMetadata)
+                    }
                         .let { serializeLocationResult(it) }
                 }.let {
                     Success(it)
@@ -82,13 +103,13 @@ internal object HyperTrackSdkWrapper {
 
     fun getIsAvailable(): WrapperResult<Serialized> {
         return Success(
-            serializeIsAvailable(HyperTrack.isAvailable)
+            serializeIsAvailable(HyperTrack.isAvailable),
         )
     }
 
     fun getIsTracking(): WrapperResult<Serialized> {
         return Success(
-            serializeIsTracking(HyperTrack.isTracking)
+            serializeIsTracking(HyperTrack.isTracking),
         )
     }
 
@@ -106,13 +127,13 @@ internal object HyperTrackSdkWrapper {
 
     fun getMetadata(): WrapperResult<Serialized> {
         return Success(
-            serializeMetadata(HyperTrack.metadata.toMap())
+            serializeMetadata(HyperTrack.metadata.toMap()),
         )
     }
 
     fun getName(): WrapperResult<Serialized> {
         return Success(
-            serializeName(HyperTrack.name)
+            serializeName(HyperTrack.name),
         )
     }
 
@@ -153,5 +174,4 @@ internal object HyperTrackSdkWrapper {
                 HyperTrack.name = name
             }
     }
-
 }