From bd14c77ff08c8940cdd2d77b39c88f81d55ac16a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Apr 2021 11:43:52 +0200
Subject: [PATCH] Improve room name for invitation

---
 .../database/model/RoomMemberSummaryEntity.kt  |  2 ++
 .../room/membership/RoomDisplayNameResolver.kt | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
index a48b081f02..e970fab397 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
@@ -39,5 +39,7 @@ internal open class RoomMemberSummaryEntity(@PrimaryKey var primaryKey: String =
             membershipStr = value.name
         }
 
+    fun getBestName() = displayName?.takeIf { it.isNotBlank() } ?: userId
+
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 0e18e30b13..f19862b397 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -77,14 +77,14 @@ internal class RoomDisplayNameResolver @Inject constructor(
         if (roomEntity?.membership == Membership.INVITE) {
             val inviteMeEvent = roomMembers.getLastStateEvent(userId)
             val inviterId = inviteMeEvent?.sender
-            name = if (inviterId != null) {
-                activeMembers.where()
-                        .equalTo(RoomMemberSummaryEntityFields.USER_ID, inviterId)
-                        .findFirst()
-                        ?.displayName
-            } else {
-                roomDisplayNameFallbackProvider.getNameForRoomInvite()
-            }
+            name = inviterId
+                    ?.let {
+                        activeMembers.where()
+                                .equalTo(RoomMemberSummaryEntityFields.USER_ID, it)
+                                .findFirst()
+                                ?.getBestName()
+                    }
+                    ?: roomDisplayNameFallbackProvider.getNameForRoomInvite()
         } else if (roomEntity?.membership == Membership.JOIN) {
             val roomSummary = RoomSummaryEntity.where(realm, roomId).findFirst()
             val invitedCount = roomSummary?.invitedMembersCount ?: 0
@@ -150,7 +150,7 @@ internal class RoomDisplayNameResolver @Inject constructor(
         if (roomMemberSummary == null) return null
         val isUnique = roomMemberHelper.isUniqueDisplayName(roomMemberSummary.displayName)
         return if (isUnique) {
-            roomMemberSummary.displayName
+            roomMemberSummary.getBestName()
         } else {
             "${roomMemberSummary.displayName} (${roomMemberSummary.userId})"
         }