From 914db8c6be84375975da0989182f2394ca5f7e8e Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Thu, 21 Apr 2022 15:52:16 +0200
Subject: [PATCH] Removing BeaconInfo structure
---
.../room/model/livelocation/BeaconInfo.kt | 33 -------------------
.../livelocation/LiveLocationBeaconContent.kt | 16 ++++++---
...DefaultLiveLocationAggregationProcessor.kt | 4 +--
.../session/room/state/DefaultStateService.kt | 14 ++------
.../factory/LiveLocationMessageItemFactory.kt | 2 +-
.../location/LocationSharingService.kt | 7 ++--
6 files changed, 19 insertions(+), 57 deletions(-)
delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt
deleted file mode 100644
index 873edc0f1f..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.api.session.room.model.livelocation
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-data class BeaconInfo(
- @Json(name = "description") val description: String? = null,
- /**
- * Beacon should be considered as inactive after this timeout as milliseconds.
- */
- @Json(name = "timeout") val timeout: Long? = null,
- /**
- * Should be set true to start sharing beacon.
- */
- @Json(name = "live") val isLive: Boolean? = null
-)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt
index 106e76eafd..a7c78f6e80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt
@@ -39,10 +39,18 @@ data class LiveLocationBeaconContent(
@Json(name = "m.new_content") override val newContent: Content? = null,
/**
- * Indicates user's intent to share ephemeral location.
+ * Optional description of the beacon.
*/
- @Json(name = "org.matrix.msc3672.beacon_info") val unstableBeaconInfo: BeaconInfo? = null,
- @Json(name = "m.beacon_info") val beaconInfo: BeaconInfo? = null,
+ @Json(name = "description") val description: String? = null,
+ /**
+ * Beacon should be considered as inactive after this timeout as milliseconds.
+ */
+ @Json(name = "timeout") val timeout: Long? = null,
+ /**
+ * Should be set true to start sharing beacon.
+ */
+ @Json(name = "live") val isLive: Boolean? = null,
+
/**
* Beacon creation timestamp.
*/
@@ -65,8 +73,6 @@ data class LiveLocationBeaconContent(
var hasTimedOut: Boolean = false
) : MessageContent {
- fun getBestBeaconInfo() = beaconInfo ?: unstableBeaconInfo
-
fun getBestTimestampAsMilliseconds() = timestampAsMilliseconds ?: unstableTimestampAsMilliseconds
fun getBestLocationAsset() = locationAsset ?: unstableLocationAsset
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
index 95e196c762..8de0965b40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
@@ -59,7 +59,7 @@ internal class DefaultLiveLocationAggregationProcessor @Inject constructor() : L
}
// Check if live location is ended
- if (!beaconInfoContent.getBestBeaconInfo()?.isLive.orFalse()) {
+ if (!beaconInfoContent.isLive.orFalse()) {
Timber.v("## LIVE LOCATION. Beacon info is not live anymore")
return
}
@@ -79,7 +79,7 @@ internal class DefaultLiveLocationAggregationProcessor @Inject constructor() : L
liveLocationContent: MessageLiveLocationContent): Boolean {
val beaconInfoStartTime = beaconInfoContent.getBestTimestampAsMilliseconds() ?: 0
val liveLocationEventTime = liveLocationContent.getBestTimestampAsMilliseconds() ?: 0
- val timeout = beaconInfoContent.getBestBeaconInfo()?.timeout ?: 0
+ val timeout = beaconInfoContent.timeout ?: 0
return liveLocationEventTime - beaconInfoStartTime > timeout
}
}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 89d33f98d2..0a4fd875d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
-import org.matrix.android.sdk.api.session.room.model.livelocation.BeaconInfo
import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
import org.matrix.android.sdk.api.session.room.state.StateService
import org.matrix.android.sdk.api.util.JsonDict
@@ -194,19 +193,12 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
override suspend fun stopLiveLocation(userId: String) {
getLiveLocationBeaconInfo(userId, true)?.let { beaconInfoStateEvent ->
beaconInfoStateEvent.getClearContent()?.toModel<LiveLocationBeaconContent>()?.let { content ->
- val beaconContent = LiveLocationBeaconContent(
- unstableBeaconInfo = BeaconInfo(
- description = content.getBestBeaconInfo()?.description,
- timeout = content.getBestBeaconInfo()?.timeout,
- isLive = false,
- ),
- unstableTimestampAsMilliseconds = System.currentTimeMillis()
- ).toContent()
+ val updatedContent = content.copy(isLive = false).toContent()
beaconInfoStateEvent.stateKey?.let {
sendStateEvent(
eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
- body = beaconContent,
+ body = updatedContent,
stateKey = it
)
}
@@ -225,7 +217,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
}
.firstOrNull { beaconInfoEvent ->
!filterOnlyLive ||
- beaconInfoEvent.getClearContent()?.toModel<LiveLocationBeaconContent>()?.getBestBeaconInfo()?.isLive.orFalse()
+ beaconInfoEvent.getClearContent()?.toModel<LiveLocationBeaconContent>()?.isLive.orFalse()
}
}
}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt
index 9bc148a562..c417038935 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt
@@ -46,7 +46,7 @@ class LiveLocationMessageItemFactory @Inject constructor(
}
private fun isLiveRunning(liveLocationContent: LiveLocationBeaconContent): Boolean {
- return liveLocationContent.getBestBeaconInfo()?.isLive.orFalse() && liveLocationContent.hasTimedOut.not()
+ return liveLocationContent.isLive.orFalse() && liveLocationContent.hasTimedOut.not()
}
private fun buildStartLiveItem(
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
index 2126cdac04..4e0980173b 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
@@ -31,7 +31,6 @@ import kotlinx.parcelize.Parcelize
import org.matrix.android.sdk.api.session.Session
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.toContent
-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
@@ -97,10 +96,8 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
private suspend fun sendLiveBeaconInfo(session: Session, roomArgs: RoomArgs) {
val beaconContent = LiveLocationBeaconContent(
- unstableBeaconInfo = BeaconInfo(
- timeout = roomArgs.durationMillis,
- isLive = true
- ),
+ timeout = roomArgs.durationMillis,
+ isLive = true,
unstableTimestampAsMilliseconds = clock.epochMillis()
).toContent()