From 3a36762632738785a4244896e7cdef64be36115e Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Mon, 2 May 2022 14:56:36 +0200 Subject: [PATCH] Fix some namings after rebase --- .../timeline/factory/LiveLocationShareMessageItemFactory.kt | 2 +- .../detail/timeline/helper/MessageInformationDataFactory.kt | 2 +- .../home/room/detail/timeline/item/MessageInformationData.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt index 8217d1cc33..cf8423593d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt @@ -132,7 +132,7 @@ class LiveLocationShareMessageItemFactory @Inject constructor( } private fun getEndOfLiveDateTime(liveLocationShareSummaryData: LiveLocationShareSummaryData): LocalDateTime? { - return liveLocationShareSummaryData.endOfLiveTimestampAsMilliseconds?.let { DateProvider.toLocalDateTime(timestamp = it) } + return liveLocationShareSummaryData.endOfLiveTimestampMillis?.let { DateProvider.toLocalDateTime(timestamp = it) } } private sealed class LiveLocationShareViewState { diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt index 8fb7aea7e4..4425415563 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt @@ -193,7 +193,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses return event.annotations?.liveLocationShareAggregatedSummary?.let { summary -> LiveLocationShareSummaryData( isActive = summary.isActive, - endOfLiveTimestampAsMilliseconds = summary.endOfLiveTimestampAsMilliseconds, + endOfLiveTimestampMillis = summary.endOfLiveTimestampMillis, lastGeoUri = summary.lastLocationDataContent?.getBestLocationInfo()?.geoUri ) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt index 8ad4034a32..dae1c3671d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt @@ -104,7 +104,7 @@ data class PollVoteSummaryData( @Parcelize data class LiveLocationShareSummaryData( val isActive: Boolean?, - val endOfLiveTimestampAsMilliseconds: Long?, + val endOfLiveTimestampMillis: Long?, val lastGeoUri: String?, ) : Parcelable