Update HyperTrack SDK iOS to 5.5.2 and Android to 7.5.3 (#102)

Add docs links to addGeotag comments. Fix order handle serialization. Fix Kotlin formatting.
hypertrack · Apr 24, 2024 · 25a7407 · 25a7407
1 parent f15988e
commit 25a7407
Show file tree

Hide file tree

Showing 36 changed files with 236 additions and 167 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,15 +5,18 @@
 root = true
 
 [*]
-
 indent_style = space
 indent_size = 2
-
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{kt,kts}]
-indent_style = space
+[**/*.{kt,kts}]
 indent_size = 4
+indent_style = space
+ktlint_standard_enum-entry-name-case = disabled
+ktlint_standard_max-line-length = disabled
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_no-consecutive-blank-lines = disabled
+ktlint_standard_no-consecutive-comments = disabled
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.3.1] - 2024-04-24
+
+### Changed
+
+- Updated HyperTrack SDK iOS to [5.5.2](https://github.com/hypertrack/sdk-ios/releases/tag/5.5.2)
+- Updated HyperTrack SDK Android to [7.5.3](https://github.com/hypertrack/sdk-android/releases/tag/7.5.3)
+
 ## [13.3.0] - 2024-04-19
 
 ### Added
@@ -819,3 +826,4 @@ Initial release.
 [13.2.2]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.2.2
 [13.2.3]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.2.3
 [13.3.0]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.3.0
+[13.3.1]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.3.1
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 [![GitHub](https://img.shields.io/github/license/hypertrack/sdk-react-native?color=orange)](./LICENSE)
 [![npm](https://img.shields.io/npm/v/hypertrack-sdk-react-native.svg)](https://www.npmjs.com/package/hypertrack-sdk-react-native)
-[![iOS SDK](https://img.shields.io/badge/iOS%20SDK-5.5.1-brightgreen.svg)](https://github.com/hypertrack/sdk-ios)
-[![Android SDK](https://img.shields.io/badge/Android%20SDK-7.5.2-brightgreen.svg)](https://github.com/hypertrack/sdk-android)
+[![iOS SDK](https://img.shields.io/badge/iOS%20SDK-5.5.2-brightgreen.svg)](https://github.com/hypertrack/sdk-ios)
+[![Android SDK](https://img.shields.io/badge/Android%20SDK-7.5.3-brightgreen.svg)](https://github.com/hypertrack/sdk-android)
 
 [HyperTrack](https://www.hypertrack.com) lets you add live location tracking to your mobile app. Live location is made available along with ongoing activity, tracking controls and tracking outage with reasons.
 

diff --git a/docs/classes/HyperTrack.html b/docs/classes/HyperTrack.html
diff --git a/docs/enums/HyperTrackError.html b/docs/enums/HyperTrackError.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/modules.html b/docs/modules.html
diff --git a/docs/types/Errors.html b/docs/types/Errors.html
diff --git a/docs/types/Failure.html b/docs/types/Failure.html
diff --git a/docs/types/Location.html b/docs/types/Location.html
diff --git a/docs/types/LocationError.html b/docs/types/LocationError.html
diff --git a/docs/types/LocationWithDeviation.html b/docs/types/LocationWithDeviation.html
diff --git a/docs/types/NotRunning.html b/docs/types/NotRunning.html
diff --git a/docs/types/OrderStatus.html b/docs/types/OrderStatus.html
diff --git a/docs/types/Result.html b/docs/types/Result.html
diff --git a/docs/types/Starting.html b/docs/types/Starting.html
diff --git a/docs/types/Success.html b/docs/types/Success.html
diff --git a/justfile b/justfile
@@ -2,6 +2,7 @@
 alias b := build
 alias cnm := _clear-node-modules
 alias d := docs
+alias f := format
 alias gd := get-dependencies
 alias od := open-docs
 alias pt := push-tag
@@ -41,7 +42,7 @@ _clear-node-modules:
     rm -rf plugin_android_location_services_google_19_0_1/node_modules
     rm -rf plugin_android_push_service_firebase/node_modules
 
-docs:
+docs: format
     yarn --cwd sdk docs
 
 get-dependencies:
@@ -56,6 +57,9 @@ _latest-android:
 _latest-ios:
     @curl -s https://cocoapods.org/pods/HyperTrack | grep -m 1 -o -E "HyperTrack <span>{{SEMVER_REGEX}}" | grep -o -E '{{SEMVER_REGEX}}' | head -n 1
 
+format: 
+    ktlint --format sdk/android/src/main/java/
+
 open-docs: docs
     open docs/index.html
 

diff --git a/plugin_android_location_services_google/android/gradle.properties b/plugin_android_location_services_google/android/gradle.properties
@@ -3,4 +3,4 @@ PluginAndroidLocationServicesGoogle_minSdkVersion=21
 PluginAndroidLocationServicesGoogle_targetSdkVersion=31
 PluginAndroidLocationServicesGoogle_compileSdkVersion=31
 PluginAndroidLocationServicesGoogle_ndkversion=21.4.7075529
-PluginAndroidLocationServicesGoogle_HyperTrackSDKVersion=7.5.2
+PluginAndroidLocationServicesGoogle_HyperTrackSDKVersion=7.5.3
diff --git a/plugin_android_location_services_google/package.json b/plugin_android_location_services_google/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-location-services-google",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "description": "A wrapper around `Location Services Google` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/plugin_android_location_services_google_19_0_1/android/gradle.properties b/plugin_android_location_services_google_19_0_1/android/gradle.properties
@@ -3,4 +3,4 @@ PluginAndroidLocationServicesGoogle1901_minSdkVersion=21
 PluginAndroidLocationServicesGoogle1901_targetSdkVersion=31
 PluginAndroidLocationServicesGoogle1901_compileSdkVersion=31
 PluginAndroidLocationServicesGoogle1901_ndkversion=21.4.7075529
-PluginAndroidLocationServicesGoogle1901_HyperTrackSDKVersion=7.5.2
+PluginAndroidLocationServicesGoogle1901_HyperTrackSDKVersion=7.5.3
diff --git a/plugin_android_location_services_google_19_0_1/package.json b/plugin_android_location_services_google_19_0_1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-location-services-google-19-0-1",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "description": "A wrapper around `Location Services Google 19.0.1` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/plugin_android_push_service_firebase/android/gradle.properties b/plugin_android_push_service_firebase/android/gradle.properties
@@ -3,4 +3,4 @@ PluginAndroidPushServiceFirebase_minSdkVersion=21
 PluginAndroidPushServiceFirebase_targetSdkVersion=31
 PluginAndroidPushServiceFirebase_compileSdkVersion=31
 PluginAndroidPushServiceFirebase_ndkversion=21.4.7075529
-PluginAndroidPushServiceFirebase_HyperTrackSDKVersion=7.5.2
+PluginAndroidPushServiceFirebase_HyperTrackSDKVersion=7.5.3
diff --git a/plugin_android_push_service_firebase/package.json b/plugin_android_push_service_firebase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-push-service-firebase",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "description": "A wrapper around `Push Service Firebase` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/sdk/android/gradle.properties b/sdk/android/gradle.properties
@@ -1,3 +1,3 @@
 HyperTrackSdk_kotlinVersion=1.6.21
-HyperTrackSdk_HyperTrackSDKVersion=7.5.2
+HyperTrackSdk_HyperTrackSDKVersion=7.5.3
 android.useAndroidX=true
diff --git a/sdk/android/src/main/java/com/reactnativehypertracksdk/HyperTrackReactNativePlugin.kt b/sdk/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)

diff --git a/sdk/android/src/main/java/com/reactnativehypertracksdk/ReactNativeSerialization.kt b/sdk/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())
                 }

diff --git a/sdk/android/src/main/java/com/reactnativehypertracksdk/common/HyperTrackSdkWrapper.kt b/sdk/android/src/main/java/com/reactnativehypertracksdk/common/HyperTrackSdkWrapper.kt
@@ -28,20 +28,20 @@ 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) {
@@ -53,7 +53,7 @@ internal object HyperTrackSdkWrapper {
                             orderHandle = orderHandle,
                             orderStatus = orderStatus,
                             expectedLocation = expectedLocation,
-                            metadata = geotagMetadata
+                            metadata = geotagMetadata,
                         )
                     } else {
                         HyperTrack.addGeotag(geotagMetadata, expectedLocation)
@@ -77,7 +77,7 @@ internal object HyperTrackSdkWrapper {
                         HyperTrack.addGeotag(
                             orderHandle = orderHandle,
                             orderStatus = orderStatus,
-                            metadata = geotagMetadata
+                            metadata = geotagMetadata,
                         )
                     } else {
                         HyperTrack.addGeotag(geotagMetadata)
@@ -103,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),
         )
     }
 
@@ -127,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),
         )
     }
 
@@ -174,5 +174,4 @@ internal object HyperTrackSdkWrapper {
                 HyperTrack.name = name
             }
     }
-
 }