Skip to content

Commit 4de3153

Browse files
pavel-kuznetsov-hypertrackpavel-kuznetsov-hypertrack
authored
Update HyperTrack SDK iOS to 5.0.7 and Android to 7.0.9 (#44)
1 parent 4c21109 commit 4de3153

File tree

98 files changed

+235
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+235
-210
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## [2.0.3] - 2023-11-20
7+
8+
### Changed
9+
10+
- Updated HyperTrack SDK iOS to [5.0.7](https://github.com/hypertrack/sdk-ios/releases/tag/5.0.7)
11+
- Updated HyperTrack SDK Android to [7.0.9](https://github.com/hypertrack/sdk-android/releases/tag/7.0.9)
12+
613
## [2.0.2] - 2023-11-10
714

815
### Changed
916

10-
- Updated HyperTrack SDK iOS to 5.0.6
11-
- Updated HyperTrack SDK Android to 7.0.8
17+
- Updated HyperTrack SDK iOS to [5.0.6](https://github.com/hypertrack/sdk-ios/releases/tag/5.0.6)
18+
- Updated HyperTrack SDK Android to [7.0.8](https://github.com/hypertrack/sdk-android/releases/tag/7.0.8)
1219

1320
## [2.0.1] - 2023-10-16
1421

@@ -249,8 +256,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
249256

250257
## [0.1.1] - 2020-06-18
251258

252-
[2.0.2]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.2
253-
254259
#### Changed
255260

256261
- 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
262267

263268
- Initial release.
264269

270+
[2.0.3]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.3
265271
[2.0.2]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.2
266272
[2.0.1]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.1
267273
[2.0.0]: https://github.com/hypertrack/sdk-flutter/releases/tag/2.0.0

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
disable 'InvalidPackage'
4444
}
4545
dependencies {
46-
def hyperTrackVersion = "7.0.8"
46+
def hyperTrackVersion = "7.0.9"
4747
implementation "com.hypertrack:sdk-android:${hyperTrackVersion}"
4848
implementation "com.hypertrack:location-services-google:${hyperTrackVersion}"
4949
implementation "com.hypertrack:push-service-firebase:${hyperTrackVersion}"

‎android/src/main/kotlin/com/hypertrack/sdk/flutter/FlutterSerialization.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import io.flutter.plugin.common.MethodChannel
66

77
private const val ERROR_CODE_METHOD_CALL = "METHOD_CALL"
88

9-
internal fun Unit.sendAsFlutterResult(call: MethodCall, flutterResult: MethodChannel.Result) {
9+
internal fun Unit.sendAsFlutterResult(
10+
call: MethodCall,
11+
flutterResult: MethodChannel.Result,
12+
) {
1013
return flutterResult.success(null)
1114
}
1215

‎android/src/main/kotlin/com/hypertrack/sdk/flutter/HyperTrackPlugin.kt‎

Lines changed: 56 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import java.lang.NullPointerException
2222
import java.util.*
2323

2424
public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
25-
2625
// receives method calls from the plugin API
2726
private var methodChannel: MethodChannel? = null
2827

@@ -69,19 +68,21 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
6968
locationEventChannel = null
7069
}
7170

72-
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
71+
override fun onMethodCall(
72+
call: MethodCall,
73+
result: MethodChannel.Result,
74+
) {
7375
invokeSdkMethod(call).sendAsFlutterResult(call, result)
7476
}
7577

76-
private fun invokeSdkMethod(
77-
call: MethodCall,
78-
): WrapperResult<*> {
79-
val method = SdkMethod
80-
.values()
81-
.firstOrNull { it.name == call.method }
82-
?: run {
83-
return Success(NotImplemented)
84-
}
78+
private fun invokeSdkMethod(call: MethodCall): WrapperResult<*> {
79+
val method =
80+
SdkMethod
81+
.values()
82+
.firstOrNull { it.name == call.method }
83+
?: run {
84+
return Success(NotImplemented)
85+
}
8586
return when (method) {
8687
SdkMethod.addGeotag -> {
8788
withArgs<Map<String, Any?>>(call) { args ->
@@ -162,31 +163,41 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
162163

163164
private fun initEventChannels(messenger: BinaryMessenger) {
164165
errorsEventChannel = EventChannel(messenger, ERRORS_EVENT_CHANNEL_NAME)
165-
errorsEventChannel?.setStreamHandler(object : StreamHandler {
166-
override fun onListen(arguments: Any?, events: EventSink) {
167-
WrapperResult
168-
.tryAsResult {
169-
errorsCancellable = HyperTrack.subscribeToErrors { errors ->
170-
events.success(serializeErrors(errors))
171-
}
172-
}.crashAppIfError()
173-
}
166+
errorsEventChannel?.setStreamHandler(
167+
object : StreamHandler {
168+
override fun onListen(
169+
arguments: Any?,
170+
events: EventSink,
171+
) {
172+
WrapperResult
173+
.tryAsResult {
174+
errorsCancellable =
175+
HyperTrack.subscribeToErrors { errors ->
176+
events.success(serializeErrors(errors))
177+
}
178+
}.crashAppIfError()
179+
}
174180

175-
override fun onCancel(arguments: Any?) {
176-
errorsCancellable?.cancel()
177-
errorsCancellable = null
178-
}
179-
})
181+
override fun onCancel(arguments: Any?) {
182+
errorsCancellable?.cancel()
183+
errorsCancellable = null
184+
}
185+
},
186+
)
180187

181188
isTrackingEventChannel = EventChannel(messenger, IS_TRACKING_STATE_EVENT_CHANNEL_NAME)
182189
isTrackingEventChannel?.setStreamHandler(
183190
object : StreamHandler {
184-
override fun onListen(arguments: Any?, events: EventSink) {
191+
override fun onListen(
192+
arguments: Any?,
193+
events: EventSink,
194+
) {
185195
WrapperResult
186196
.tryAsResult {
187-
isTrackingCancellable = HyperTrack.subscribeToIsTracking { isTracking ->
188-
events.success(serializeIsTracking(isTracking))
189-
}
197+
isTrackingCancellable =
198+
HyperTrack.subscribeToIsTracking { isTracking ->
199+
events.success(serializeIsTracking(isTracking))
200+
}
190201
}.crashAppIfError()
191202
}
192203

@@ -200,7 +211,10 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
200211
isAvailableEventChannel = EventChannel(messenger, IS_AVAILABLE_EVENT_CHANNEL_NAME)
201212
isAvailableEventChannel?.setStreamHandler(
202213
object : StreamHandler {
203-
override fun onListen(arguments: Any?, events: EventSink) {
214+
override fun onListen(
215+
arguments: Any?,
216+
events: EventSink,
217+
) {
204218
WrapperResult
205219
.tryAsResult {
206220
isAvailableCancellable =
@@ -220,7 +234,10 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
220234
locationEventChannel = EventChannel(messenger, LOCATION_EVENT_CHANNEL_NAME)
221235
locationEventChannel?.setStreamHandler(
222236
object : StreamHandler {
223-
override fun onListen(arguments: Any?, events: EventSink) {
237+
override fun onListen(
238+
arguments: Any?,
239+
events: EventSink,
240+
) {
224241
WrapperResult
225242
.tryAsResult {
226243
locationCancellable =
@@ -240,13 +257,17 @@ public class HyperTrackPlugin : FlutterPlugin, MethodCallHandler {
240257
locateEventChannel = EventChannel(messenger, LOCATE_EVENT_CHANNEL_NAME)
241258
locateEventChannel?.setStreamHandler(
242259
object : StreamHandler {
243-
override fun onListen(arguments: Any?, events: EventSink) {
260+
override fun onListen(
261+
arguments: Any?,
262+
events: EventSink,
263+
) {
244264
WrapperResult
245265
.tryAsResult {
246266
locateCancellable?.cancel()
247-
locateCancellable = HyperTrack.locate { locateResult ->
248-
events.success(serializeLocateResult(locateResult))
249-
}
267+
locateCancellable =
268+
HyperTrack.locate { locateResult ->
269+
events.success(serializeLocateResult(locateResult))
270+
}
250271
}.crashAppIfError()
251272
}
252273

‎android/src/main/kotlin/com/hypertrack/sdk/flutter/common/HyperTrackSdkWrapper.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ typealias Serialized = Map<String, Any?>
2828
* It receives serialized params.
2929
*/
3030
internal object HyperTrackSdkWrapper {
31-
3231
fun addGeotag(args: Serialized): WrapperResult<Serialized> {
3332
return deserializeGeotagData(args)
3433
.flatMapSuccess { geotag ->
3534
// TODO: return proper error if JSON is wrong
3635
val geotagMetadata = Json.fromMap(geotag.data)!!
37-
val expectedLocation = geotag
38-
.expectedLocation
39-
?.let {
40-
HyperTrack.Location(
41-
latitude = it.latitude,
42-
longitude = it.longitude,
43-
)
44-
}
36+
val expectedLocation =
37+
geotag
38+
.expectedLocation
39+
?.let {
40+
HyperTrack.Location(
41+
latitude = it.latitude,
42+
longitude = it.longitude,
43+
)
44+
}
4545
if (expectedLocation != null) {
4646
HyperTrack
4747
.addGeotag(geotagMetadata, expectedLocation)

0 commit comments

Comments
 (0)