Code review fixes.

element-hq · Apr 1, 2022 · 97de6de · 97de6de
1 parent 922d68c
commit 97de6de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.../sdk/api/session/room/model/BeaconInfo.kt → ...ion/room/model/livelocation/BeaconInfo.kt b/.../sdk/api/session/room/model/BeaconInfo.kt → ...ion/room/model/livelocation/BeaconInfo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model.livelocation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass

diff --git a/...n/room/model/LiveLocationBeaconContent.kt → ...livelocation/LiveLocationBeaconContent.kt b/...n/room/model/LiveLocationBeaconContent.kt → ...livelocation/LiveLocationBeaconContent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.room.model
+package org.matrix.android.sdk.api.session.room.model.livelocation
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.room.model.message.LocationAsset
+import org.matrix.android.sdk.api.session.room.model.message.LocationAssetType
 
 @JsonClass(generateAdapter = true)
 data class LiveLocationBeaconContent(
@@ -31,17 +32,17 @@ data class LiveLocationBeaconContent(
          * Beacon creation timestamp.
          */
         @Json(name = "org.matrix.msc3488.ts") val unstableTimestampAsMilliseconds: Long? = null,
-        @Json(name = "m.ts") val timestampAsMillisecond: Long? = null,
+        @Json(name = "m.ts") val timestampAsMilliseconds: Long? = null,
         /**
          * Live location asset type.
          */
-        @Json(name = "org.matrix.msc3488.asset") val unstableLocationAsset: LocationAsset = LocationAsset("m.self"),
+        @Json(name = "org.matrix.msc3488.asset") val unstableLocationAsset: LocationAsset = LocationAsset(LocationAssetType.SELF),
         @Json(name = "m.asset") val locationAsset: LocationAsset? = null
 ) {
 
     fun getBestBeaconInfo() = beaconInfo ?: unstableBeaconInfo
 
-    fun getBestTimestampAsMilliseconds() = timestampAsMillisecond ?: unstableTimestampAsMilliseconds
+    fun getBestTimestampAsMilliseconds() = timestampAsMilliseconds ?: unstableTimestampAsMilliseconds
 
     fun getBestLocationAsset() = locationAsset ?: unstableLocationAsset
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
@@ -30,8 +30,8 @@ import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType.generateBeaconInfoStateEventType
 import org.matrix.android.sdk.api.session.events.model.toContent
-import org.matrix.android.sdk.api.session.room.model.BeaconInfo
-import org.matrix.android.sdk.api.session.room.model.LiveLocationBeaconContent
+import org.matrix.android.sdk.api.session.room.model.livelocation.BeaconInfo
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
 import timber.log.Timber
 import java.util.Timer
 import java.util.TimerTask
@@ -83,7 +83,7 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
             activeSessionHolder
                     .getSafeActiveSession()
                     ?.let { session ->
-                        session.coroutineScope.launch {
+                        session.coroutineScope.launch(session.coroutineDispatchers.io) {
                             sendBeaconInfo(session, roomArgs)
                         }
                     }