From 371aec4427a7ecca0eacbf13f925971ee7bc4e69 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 19 Jan 2024 16:11:10 +0100 Subject: [PATCH] Remove `RoomSummaryDetails.lastMessageTimestamp` and replace by a getter on `lastMessage` --- .../features/invitelist/impl/InviteListPresenterTests.kt | 3 --- .../messages/impl/forward/ForwardMessagesStateProvider.kt | 2 -- .../edit/EditDefaultNotificationSettingStateProvider.kt | 1 - .../android/libraries/matrix/api/roomlist/RoomSummary.kt | 5 +++-- .../matrix/impl/roomlist/RoomSummaryDetailsFactory.kt | 1 - .../android/libraries/matrix/test/room/RoomSummaryFixture.kt | 4 ---- .../android/libraries/matrix/ui/components/SelectedRoom.kt | 1 - .../libraries/roomselect/impl/RoomSelectStateProvider.kt | 2 -- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt b/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt index e691fc4029..9ba0181e45 100644 --- a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt +++ b/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt @@ -431,7 +431,6 @@ class InviteListPresenterTests { avatarUrl = null, isDirect = false, lastMessage = null, - lastMessageTimestamp = null, unreadNotificationCount = 0, inviter = RoomMember( userId = A_USER_ID, @@ -460,7 +459,6 @@ class InviteListPresenterTests { avatarUrl = null, isDirect = true, lastMessage = null, - lastMessageTimestamp = null, unreadNotificationCount = 0, inviter = RoomMember( userId = A_USER_ID, @@ -486,7 +484,6 @@ class InviteListPresenterTests { avatarUrl = null, isDirect = false, lastMessage = null, - lastMessageTimestamp = null, unreadNotificationCount = 0, ) ) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt index 7366e2453a..729714e626 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt @@ -64,7 +64,6 @@ fun aRoomDetailsState( isDirect: Boolean = true, avatarUrl: String? = null, lastMessage: RoomMessage? = null, - lastMessageTimestamp: Long? = null, unreadNotificationCount: Int = 0, inviter: RoomMember? = null, ) = RoomSummaryDetails( @@ -74,7 +73,6 @@ fun aRoomDetailsState( isDirect = isDirect, avatarUrl = avatarUrl, lastMessage = lastMessage, - lastMessageTimestamp = lastMessageTimestamp, unreadNotificationCount = unreadNotificationCount, inviter = inviter, ) diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt index cdf5845dff..c76cb97df9 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt @@ -55,7 +55,6 @@ private fun aRoomSummary() = RoomSummary.Filled( avatarUrl = null, isDirect = false, lastMessage = null, - lastMessageTimestamp = null, unreadNotificationCount = 0, notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY, ) diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt index 68e799a405..681f33d45b 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt @@ -40,10 +40,11 @@ data class RoomSummaryDetails( val isDirect: Boolean, val avatarUrl: String?, val lastMessage: RoomMessage?, - val lastMessageTimestamp: Long?, val unreadNotificationCount: Int, val inviter: RoomMember? = null, val notificationMode: RoomNotificationMode? = null, val hasOngoingCall: Boolean = false, val isDm: Boolean = false, -) +) { + val lastMessageTimestamp = lastMessage?.originServerTs +} diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt index b384430fb3..81e2e578ed 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt @@ -37,7 +37,6 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto avatarUrl = roomInfo.avatarUrl, unreadNotificationCount = roomInfo.notificationCount.toInt(), lastMessage = latestRoomMessage, - lastMessageTimestamp = latestRoomMessage?.originServerTs, inviter = roomInfo.inviter?.let(RoomMemberMapper::map), notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode), hasOngoingCall = roomInfo.hasRoomCall, diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt index 7b0269334b..11161ff3ae 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt @@ -36,7 +36,6 @@ fun aRoomSummaryFilled( isDirect: Boolean = false, avatarUrl: String? = null, lastMessage: RoomMessage? = aRoomMessage(), - lastMessageTimestamp: Long? = null, unreadNotificationCount: Int = 2, notificationMode: RoomNotificationMode? = null, ) = RoomSummary.Filled( @@ -46,7 +45,6 @@ fun aRoomSummaryFilled( isDirect = isDirect, avatarUrl = avatarUrl, lastMessage = lastMessage, - lastMessageTimestamp = lastMessageTimestamp, unreadNotificationCount = unreadNotificationCount, notificationMode = notificationMode, ) @@ -58,7 +56,6 @@ fun aRoomSummaryDetails( isDirect: Boolean = false, avatarUrl: String? = null, lastMessage: RoomMessage? = aRoomMessage(), - lastMessageTimestamp: Long? = null, unreadNotificationCount: Int = 2, notificationMode: RoomNotificationMode? = null, ) = RoomSummaryDetails( @@ -67,7 +64,6 @@ fun aRoomSummaryDetails( isDirect = isDirect, avatarUrl = avatarUrl, lastMessage = lastMessage, - lastMessageTimestamp = lastMessageTimestamp, unreadNotificationCount = unreadNotificationCount, notificationMode = notificationMode ) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt index 1195499e5b..8d603f54eb 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt @@ -101,7 +101,6 @@ internal fun SelectedRoomPreview() = ElementPreview { isDirect = true, avatarUrl = null, lastMessage = null, - lastMessageTimestamp = null, unreadNotificationCount = 0, inviter = null, ), diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt index 297f891831..afa056fb21 100644 --- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt +++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt @@ -77,7 +77,6 @@ private fun aRoomDetailsState( isDirect: Boolean = true, avatarUrl: String? = null, lastMessage: RoomMessage? = null, - lastMessageTimestamp: Long? = null, unreadNotificationCount: Int = 0, inviter: RoomMember? = null, ) = RoomSummaryDetails( @@ -87,7 +86,6 @@ private fun aRoomDetailsState( isDirect = isDirect, avatarUrl = avatarUrl, lastMessage = lastMessage, - lastMessageTimestamp = lastMessageTimestamp, unreadNotificationCount = unreadNotificationCount, inviter = inviter, )