rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming other timestamps with shorter names

Browse Source
This commit is contained in:
Maxime NATUREL 2022-05-02 14:05:05 +02:00
parent 11ebab094b
commit 3201308125
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt
View File

@ -28,6 +28,6 @@ data class LiveLocationShareAggregatedSummary(
val eventId: String, val eventId: String,
val roomId: String, val roomId: String,
val isActive: Boolean?, val isActive: Boolean?,
val endOfLiveTimestampAsMilliseconds: Long?, val endOfLiveTimestampMillis: Long?,
val lastLocationDataContent: MessageBeaconLocationDataContent?, val lastLocationDataContent: MessageBeaconLocationDataContent?,
) )

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconLocationDataContent.kt
View File

@ -50,11 +50,11 @@ data class MessageBeaconLocationDataContent(
/** /**
* Exact time that the data in the event refers to (milliseconds since the UNIX epoch) * Exact time that the data in the event refers to (milliseconds since the UNIX epoch)
*/ */
@Json(name = "org.matrix.msc3488.ts") val unstableTimestampAsMilliseconds: Long? = null, @Json(name = "org.matrix.msc3488.ts") val unstableTimestampMillis: Long? = null,
@Json(name = "m.ts") val timestampAsMilliseconds: Long? = null @Json(name = "m.ts") val timestampMillis: Long? = null
) : MessageContent { ) : MessageContent {
fun getBestLocationInfo() = locationInfo ?: unstableLocationInfo fun getBestLocationInfo() = locationInfo ?: unstableLocationInfo
fun getBestTimestampAsMilliseconds() = timestampAsMilliseconds ?: unstableTimestampAsMilliseconds fun getBestTimestampMillis() = timestampMillis ?: unstableTimestampMillis
} }

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt
View File

@ -29,7 +29,7 @@ internal object LiveLocationShareAggregatedSummaryMapper {
eventId = entity.eventId, eventId = entity.eventId,
roomId = entity.roomId, roomId = entity.roomId,
isActive = entity.isActive, isActive = entity.isActive,
endOfLiveTimestampAsMilliseconds = entity.endOfLiveTimestampAsMilliseconds, endOfLiveTimestampMillis = entity.endOfLiveTimestampMillis,
lastLocationDataContent = ContentMapper.map(entity.lastLocationContent).toModel<MessageBeaconLocationDataContent>() lastLocationDataContent = ContentMapper.map(entity.lastLocationContent).toModel<MessageBeaconLocationDataContent>()
) )
} }
@ -39,7 +39,7 @@ internal object LiveLocationShareAggregatedSummaryMapper {
eventId = model.eventId, eventId = model.eventId,
roomId = model.roomId, roomId = model.roomId,
isActive = model.isActive, isActive = model.isActive,
endOfLiveTimestampAsMilliseconds = model.endOfLiveTimestampAsMilliseconds, endOfLiveTimestampMillis = model.endOfLiveTimestampMillis,
lastLocationContent = ContentMapper.map(model.lastLocationDataContent.toContent()) lastLocationContent = ContentMapper.map(model.lastLocationDataContent.toContent())
) )
} }

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo027.kt
View File

@ -35,8 +35,8 @@ internal class MigrateSessionTo027(realm: DynamicRealm) : RealmMigrator(realm, 2
.addField(LiveLocationShareAggregatedSummaryEntityFields.ROOM_ID, String::class.java, FieldAttribute.REQUIRED) .addField(LiveLocationShareAggregatedSummaryEntityFields.ROOM_ID, String::class.java, FieldAttribute.REQUIRED)
.addField(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, Boolean::class.java) .addField(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, Boolean::class.java)
.setNullable(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true) .setNullable(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
.addField(LiveLocationShareAggregatedSummaryEntityFields.END_OF_LIVE_TIMESTAMP_AS_MILLISECONDS, Long::class.java) .addField(LiveLocationShareAggregatedSummaryEntityFields.END_OF_LIVE_TIMESTAMP_MILLIS, Long::class.java)
.setNullable(LiveLocationShareAggregatedSummaryEntityFields.END_OF_LIVE_TIMESTAMP_AS_MILLISECONDS, true) .setNullable(LiveLocationShareAggregatedSummaryEntityFields.END_OF_LIVE_TIMESTAMP_MILLIS, true)
.addField(LiveLocationShareAggregatedSummaryEntityFields.LAST_LOCATION_CONTENT, String::class.java) .addField(LiveLocationShareAggregatedSummaryEntityFields.LAST_LOCATION_CONTENT, String::class.java)
?: return ?: return

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
View File

@ -33,7 +33,7 @@ internal open class LiveLocationShareAggregatedSummaryEntity(
var isActive: Boolean? = null, var isActive: Boolean? = null,
var endOfLiveTimestampAsMilliseconds: Long? = null, var endOfLiveTimestampMillis: Long? = null,
/** /**
* For now we persist this as a JSON for greater flexibility * For now we persist this as a JSON for greater flexibility

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
View File

@ -56,7 +56,7 @@ internal class DefaultLiveLocationAggregationProcessor @Inject constructor() : L
Timber.d("updating summary of id=$targetEventId with isLive=${content.isLive}") Timber.d("updating summary of id=$targetEventId with isLive=${content.isLive}")
aggregatedSummary.endOfLiveTimestampAsMilliseconds = content.getBestTimestampMillis()?.let { it + (content.timeout ?: 0) } aggregatedSummary.endOfLiveTimestampMillis = content.getBestTimestampMillis()?.let { it + (content.timeout ?: 0) }
aggregatedSummary.isActive = content.isLive aggregatedSummary.isActive = content.isLive
} }
@ -77,11 +77,11 @@ internal class DefaultLiveLocationAggregationProcessor @Inject constructor() : L
roomId = roomId, roomId = roomId,
eventId = targetEventId eventId = targetEventId
) )
val updatedLocationTimestamp = content.getBestTimestampAsMilliseconds() ?: 0 val updatedLocationTimestamp = content.getBestTimestampMillis() ?: 0
val currentLocationTimestamp = ContentMapper val currentLocationTimestamp = ContentMapper
.map(aggregatedSummary.lastLocationContent) .map(aggregatedSummary.lastLocationContent)
.toModel<MessageBeaconLocationDataContent>() .toModel<MessageBeaconLocationDataContent>()
?.getBestTimestampAsMilliseconds() ?.getBestTimestampMillis()
?: 0 ?: 0
if (updatedLocationTimestamp.isMoreRecentThan(currentLocationTimestamp)) { if (updatedLocationTimestamp.isMoreRecentThan(currentLocationTimestamp)) {

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
View File

@ -261,7 +261,7 @@ internal class LocalEchoEventFactory @Inject constructor(
eventId = beaconInfoEventId eventId = beaconInfoEventId
), ),
unstableLocationInfo = LocationInfo(geoUri = geoUri, description = geoUri), unstableLocationInfo = LocationInfo(geoUri = geoUri, description = geoUri),
unstableTimestampAsMilliseconds = System.currentTimeMillis(), unstableTimestampMillis = System.currentTimeMillis(),
) )
val localId = LocalEcho.createLocalEchoId() val localId = LocalEcho.createLocalEchoId()
return Event( return Event(