Browse Source

Remove `RoomSummaryDetails.lastMessageTimestamp` and replace by a getter on `lastMessage`

pull/2130/head
Benoit Marty 8 months ago
parent
commit
2c691d527b
  1. 3
      features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
  2. 2
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt
  3. 1
      features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt
  4. 5
      libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
  5. 1
      libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt
  6. 4
      libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
  7. 1
      libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
  8. 2
      libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt

3
features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt

@ -431,7 +431,6 @@ class InviteListPresenterTests {
avatarUrl = null, avatarUrl = null,
isDirect = false, isDirect = false,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null,
unreadNotificationCount = 0, unreadNotificationCount = 0,
inviter = RoomMember( inviter = RoomMember(
userId = A_USER_ID, userId = A_USER_ID,
@ -460,7 +459,6 @@ class InviteListPresenterTests {
avatarUrl = null, avatarUrl = null,
isDirect = true, isDirect = true,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null,
unreadNotificationCount = 0, unreadNotificationCount = 0,
inviter = RoomMember( inviter = RoomMember(
userId = A_USER_ID, userId = A_USER_ID,
@ -486,7 +484,6 @@ class InviteListPresenterTests {
avatarUrl = null, avatarUrl = null,
isDirect = false, isDirect = false,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null,
unreadNotificationCount = 0, unreadNotificationCount = 0,
) )
) )

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt

@ -64,7 +64,6 @@ fun aRoomDetailsState(
isDirect: Boolean = true, isDirect: Boolean = true,
avatarUrl: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = null, lastMessage: RoomMessage? = null,
lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 0, unreadNotificationCount: Int = 0,
inviter: RoomMember? = null, inviter: RoomMember? = null,
) = RoomSummaryDetails( ) = RoomSummaryDetails(
@ -74,7 +73,6 @@ fun aRoomDetailsState(
isDirect = isDirect, isDirect = isDirect,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,
inviter = inviter, inviter = inviter,
) )

1
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, avatarUrl = null,
isDirect = false, isDirect = false,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null,
unreadNotificationCount = 0, unreadNotificationCount = 0,
notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY, notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
) )

5
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 isDirect: Boolean,
val avatarUrl: String?, val avatarUrl: String?,
val lastMessage: RoomMessage?, val lastMessage: RoomMessage?,
val lastMessageTimestamp: Long?,
val unreadNotificationCount: Int, val unreadNotificationCount: Int,
val inviter: RoomMember? = null, val inviter: RoomMember? = null,
val notificationMode: RoomNotificationMode? = null, val notificationMode: RoomNotificationMode? = null,
val hasOngoingCall: Boolean = false, val hasOngoingCall: Boolean = false,
val isDm: Boolean = false, val isDm: Boolean = false,
) ) {
val lastMessageTimestamp = lastMessage?.originServerTs
}

1
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, avatarUrl = roomInfo.avatarUrl,
unreadNotificationCount = roomInfo.notificationCount.toInt(), unreadNotificationCount = roomInfo.notificationCount.toInt(),
lastMessage = latestRoomMessage, lastMessage = latestRoomMessage,
lastMessageTimestamp = latestRoomMessage?.originServerTs,
inviter = roomInfo.inviter?.let(RoomMemberMapper::map), inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode), notificationMode = roomInfo.userDefinedNotificationMode?.let(RoomNotificationSettingsMapper::mapMode),
hasOngoingCall = roomInfo.hasRoomCall, hasOngoingCall = roomInfo.hasRoomCall,

4
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt

@ -36,7 +36,6 @@ fun aRoomSummaryFilled(
isDirect: Boolean = false, isDirect: Boolean = false,
avatarUrl: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = aRoomMessage(), lastMessage: RoomMessage? = aRoomMessage(),
lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 2, unreadNotificationCount: Int = 2,
notificationMode: RoomNotificationMode? = null, notificationMode: RoomNotificationMode? = null,
) = RoomSummary.Filled( ) = RoomSummary.Filled(
@ -46,7 +45,6 @@ fun aRoomSummaryFilled(
isDirect = isDirect, isDirect = isDirect,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,
notificationMode = notificationMode, notificationMode = notificationMode,
) )
@ -58,7 +56,6 @@ fun aRoomSummaryDetails(
isDirect: Boolean = false, isDirect: Boolean = false,
avatarUrl: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = aRoomMessage(), lastMessage: RoomMessage? = aRoomMessage(),
lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 2, unreadNotificationCount: Int = 2,
notificationMode: RoomNotificationMode? = null, notificationMode: RoomNotificationMode? = null,
) = RoomSummaryDetails( ) = RoomSummaryDetails(
@ -67,7 +64,6 @@ fun aRoomSummaryDetails(
isDirect = isDirect, isDirect = isDirect,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,
notificationMode = notificationMode notificationMode = notificationMode
) )

1
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt

@ -101,7 +101,6 @@ internal fun SelectedRoomPreview() = ElementPreview {
isDirect = true, isDirect = true,
avatarUrl = null, avatarUrl = null,
lastMessage = null, lastMessage = null,
lastMessageTimestamp = null,
unreadNotificationCount = 0, unreadNotificationCount = 0,
inviter = null, inviter = null,
), ),

2
libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt

@ -77,7 +77,6 @@ private fun aRoomDetailsState(
isDirect: Boolean = true, isDirect: Boolean = true,
avatarUrl: String? = null, avatarUrl: String? = null,
lastMessage: RoomMessage? = null, lastMessage: RoomMessage? = null,
lastMessageTimestamp: Long? = null,
unreadNotificationCount: Int = 0, unreadNotificationCount: Int = 0,
inviter: RoomMember? = null, inviter: RoomMember? = null,
) = RoomSummaryDetails( ) = RoomSummaryDetails(
@ -87,7 +86,6 @@ private fun aRoomDetailsState(
isDirect = isDirect, isDirect = isDirect,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
lastMessage = lastMessage, lastMessage = lastMessage,
lastMessageTimestamp = lastMessageTimestamp,
unreadNotificationCount = unreadNotificationCount, unreadNotificationCount = unreadNotificationCount,
inviter = inviter, inviter = inviter,
) )

Loading…
Cancel
Save