From e467e2ca08a973fa6a649e52a7cad180797a276e Mon Sep 17 00:00:00 2001 From: yostyle Date: Wed, 14 Apr 2021 11:35:21 +0200 Subject: [PATCH 1/2] Expose directUserId in RoomSummary --- .../org/matrix/android/sdk/api/session/room/model/RoomSummary.kt | 1 + .../android/sdk/internal/database/mapper/RoomSummaryMapper.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt index 9455a83aff..8a2aecd76d 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt @@ -36,6 +36,7 @@ data class RoomSummary constructor( val canonicalAlias: String? = null, val aliases: List = emptyList(), val isDirect: Boolean = false, + val directUserId: String? = null, val joinedMembersCount: Int? = 0, val invitedMembersCount: Int? = 0, val latestPreviewableEvent: TimelineEvent? = null, diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt index 6dc70b60fc..d6b46ae436 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt @@ -43,6 +43,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa topic = roomSummaryEntity.topic ?: "", avatarUrl = roomSummaryEntity.avatarUrl ?: "", isDirect = roomSummaryEntity.isDirect, + directUserId = roomSummaryEntity.directUserId ?: "", latestPreviewableEvent = latestEvent, joinedMembersCount = roomSummaryEntity.joinedMembersCount, invitedMembersCount = roomSummaryEntity.invitedMembersCount, From 506bdd8eb06a84b6151b413a4fd107ddc24f6138 Mon Sep 17 00:00:00 2001 From: yostyle Date: Wed, 28 Apr 2021 12:22:43 +0200 Subject: [PATCH 2/2] directUserId can be null --- .../android/sdk/internal/database/mapper/RoomSummaryMapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt index d6b46ae436..6c91f72c7b 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt @@ -43,7 +43,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa topic = roomSummaryEntity.topic ?: "", avatarUrl = roomSummaryEntity.avatarUrl ?: "", isDirect = roomSummaryEntity.isDirect, - directUserId = roomSummaryEntity.directUserId ?: "", + directUserId = roomSummaryEntity.directUserId, latestPreviewableEvent = latestEvent, joinedMembersCount = roomSummaryEntity.joinedMembersCount, invitedMembersCount = roomSummaryEntity.invitedMembersCount,