Update HyperTrack SDK iOS to 5.0.7 and Android to 7.0.9 (#44)

hypertrack · Nov 24, 2023 · 4de3153 · 4de3153
1 parent 4c21109
commit 4de3153
Show file tree

Hide file tree

Showing 98 changed files with 235 additions and 210 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,12 +3,19 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.3] - 2023-11-20
+
+### Changed
+
+- Updated HyperTrack SDK iOS to [5.0.7](https://github.com/hypertrack/sdk-ios/releases/tag/5.0.7)
+- Updated HyperTrack SDK Android to [7.0.9](https://github.com/hypertrack/sdk-android/releases/tag/7.0.9)
+
 ## [2.0.2] - 2023-11-10
 
 ### Changed
 
-- Updated HyperTrack SDK iOS to 5.0.6
-- Updated HyperTrack SDK Android to 7.0.8
+- Updated HyperTrack SDK iOS to [5.0.6](https://github.com/hypertrack/sdk-ios/releases/tag/5.0.6)
+- Updated HyperTrack SDK Android to [7.0.8](https://github.com/hypertrack/sdk-android/releases/tag/7.0.8)
 
 ## [2.0.1] - 2023-10-16
 
@@ -249,8 +256,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.1.1] - 2020-06-18
 
-[2.0.2]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.2
-
 #### Changed
 
 - Android SDK version updated to 4.4.1
@@ -262,6 +267,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release.
 
+[2.0.3]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.3
 [2.0.2]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.2
 [2.0.1]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.1
 [2.0.0]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.0

diff --git a/android/build.gradle b/android/build.gradle
@@ -43,7 +43,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        def hyperTrackVersion = "7.0.8"
+        def hyperTrackVersion = "7.0.9"
         implementation "com.hypertrack:sdk-android:${hyperTrackVersion}"
         implementation "com.hypertrack:location-services-google:${hyperTrackVersion}"
         implementation "com.hypertrack:push-service-firebase:${hyperTrackVersion}"

diff --git a/android/src/main/kotlin/com/hypertrack/sdk/flutter/FlutterSerialization.kt b/android/src/main/kotlin/com/hypertrack/sdk/flutter/FlutterSerialization.kt
@@ -6,7 +6,10 @@ import io.flutter.plugin.common.MethodChannel
 
 private const val ERROR_CODE_METHOD_CALL = "METHOD_CALL"
 
-internal fun Unit.sendAsFlutterResult(call: MethodCall, flutterResult: MethodChannel.Result) {
+internal fun Unit.sendAsFlutterResult(
+    call: MethodCall,
+    flutterResult: MethodChannel.Result,
+) {
     return flutterResult.success(null)
 }
 

diff --git a/android/src/main/kotlin/com/hypertrack/sdk/flutter/HyperTrackPlugin.kt b/android/src/main/kotlin/com/hypertrack/sdk/flutter/HyperTrackPlugin.kt
@@ -22,7 +22,6 @@ import java.lang.NullPointerException
 import java.util.*
 
 public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
-
     // receives method calls from the plugin API
     private var methodChannel: MethodChannel? = null
 
@@ -69,19 +68,21 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
         locationEventChannel = null
     }
 
-    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+    override fun onMethodCall(
+        call: MethodCall,
+        result: MethodChannel.Result,
+    ) {
         invokeSdkMethod(call).sendAsFlutterResult(call, result)
     }
 
-    private fun invokeSdkMethod(
-        call: MethodCall,
-    ): WrapperResult<*> {
-        val method = SdkMethod
-            .values()
-            .firstOrNull { it.name == call.method }
-            ?: run {
-                return Success(NotImplemented)
-            }
+    private fun invokeSdkMethod(call: MethodCall): WrapperResult<*> {
+        val method =
+            SdkMethod
+                .values()
+                .firstOrNull { it.name == call.method }
+                ?: run {
+                    return Success(NotImplemented)
+                }
         return when (method) {
             SdkMethod.addGeotag -> {
                 withArgs<Map<String, Any?>>(call) { args ->
@@ -162,31 +163,41 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
 
     private fun initEventChannels(messenger: BinaryMessenger) {
         errorsEventChannel = EventChannel(messenger, ERRORS_EVENT_CHANNEL_NAME)
-        errorsEventChannel?.setStreamHandler(object : StreamHandler {
-            override fun onListen(arguments: Any?, events: EventSink) {
-                WrapperResult
-                    .tryAsResult {
-                        errorsCancellable = HyperTrack.subscribeToErrors { errors ->
-                            events.success(serializeErrors(errors))
-                        }
-                    }.crashAppIfError()
-            }
+        errorsEventChannel?.setStreamHandler(
+            object : StreamHandler {
+                override fun onListen(
+                    arguments: Any?,
+                    events: EventSink,
+                ) {
+                    WrapperResult
+                        .tryAsResult {
+                            errorsCancellable =
+                                HyperTrack.subscribeToErrors { errors ->
+                                    events.success(serializeErrors(errors))
+                                }
+                        }.crashAppIfError()
+                }
 
-            override fun onCancel(arguments: Any?) {
-                errorsCancellable?.cancel()
-                errorsCancellable = null
-            }
-        })
+                override fun onCancel(arguments: Any?) {
+                    errorsCancellable?.cancel()
+                    errorsCancellable = null
+                }
+            },
+        )
 
         isTrackingEventChannel = EventChannel(messenger, IS_TRACKING_STATE_EVENT_CHANNEL_NAME)
         isTrackingEventChannel?.setStreamHandler(
             object : StreamHandler {
-                override fun onListen(arguments: Any?, events: EventSink) {
+                override fun onListen(
+                    arguments: Any?,
+                    events: EventSink,
+                ) {
                     WrapperResult
                         .tryAsResult {
-                            isTrackingCancellable = HyperTrack.subscribeToIsTracking { isTracking ->
-                                events.success(serializeIsTracking(isTracking))
-                            }
+                            isTrackingCancellable =
+                                HyperTrack.subscribeToIsTracking { isTracking ->
+                                    events.success(serializeIsTracking(isTracking))
+                                }
                         }.crashAppIfError()
                 }
 
@@ -200,7 +211,10 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
         isAvailableEventChannel = EventChannel(messenger, IS_AVAILABLE_EVENT_CHANNEL_NAME)
         isAvailableEventChannel?.setStreamHandler(
             object : StreamHandler {
-                override fun onListen(arguments: Any?, events: EventSink) {
+                override fun onListen(
+                    arguments: Any?,
+                    events: EventSink,
+                ) {
                     WrapperResult
                         .tryAsResult {
                             isAvailableCancellable =
@@ -220,7 +234,10 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
         locationEventChannel = EventChannel(messenger, LOCATION_EVENT_CHANNEL_NAME)
         locationEventChannel?.setStreamHandler(
             object : StreamHandler {
-                override fun onListen(arguments: Any?, events: EventSink) {
+                override fun onListen(
+                    arguments: Any?,
+                    events: EventSink,
+                ) {
                     WrapperResult
                         .tryAsResult {
                             locationCancellable =
@@ -240,13 +257,17 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
         locateEventChannel = EventChannel(messenger, LOCATE_EVENT_CHANNEL_NAME)
         locateEventChannel?.setStreamHandler(
             object : StreamHandler {
-                override fun onListen(arguments: Any?, events: EventSink) {
+                override fun onListen(
+                    arguments: Any?,
+                    events: EventSink,
+                ) {
                     WrapperResult
                         .tryAsResult {
                             locateCancellable?.cancel()
-                            locateCancellable = HyperTrack.locate { locateResult ->
-                                events.success(serializeLocateResult(locateResult))
-                            }
+                            locateCancellable =
+                                HyperTrack.locate { locateResult ->
+                                    events.success(serializeLocateResult(locateResult))
+                                }
                         }.crashAppIfError()
                 }
 

diff --git a/android/src/main/kotlin/com/hypertrack/sdk/flutter/common/HyperTrackSdkWrapper.kt b/android/src/main/kotlin/com/hypertrack/sdk/flutter/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,
+                            )
+                        }
                 if (expectedLocation != null) {
                     HyperTrack
                         .addGeotag(geotagMetadata, expectedLocation)