From 5dc28c0564e0f672e7517c0774143f67c29f2e95 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Apr 2021 18:20:12 +0200
Subject: [PATCH] Fix avatar for DM when other user has left

---
 .../sdk/internal/session/room/RoomAvatarResolver.kt       | 8 +++++++-
 .../session/room/membership/RoomDisplayNameResolver.kt    | 3 +--
 .../internal/session/room/membership/RoomMemberHelper.kt  | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
index 0de8d6347a..60ad83ee05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
@@ -56,7 +56,13 @@ internal class RoomAvatarResolver @Inject constructor(@UserId private val userId
 
         if (isDirectRoom) {
             if (members.size == 1) {
-                return members.firstOrNull()?.avatarUrl
+                // Use avatar of a left user
+                val firstLeftAvatarUrl = roomMembers.queryLeftRoomMembersEvent()
+                        .findAll()
+                        .firstOrNull { !it.avatarUrl.isNullOrEmpty() }
+                        ?.avatarUrl
+
+                return firstLeftAvatarUrl ?: members.firstOrNull()?.avatarUrl
             } else if (members.size == 2) {
                 val firstOtherMember = members.where().notEqualTo(RoomMemberSummaryEntityFields.USER_ID, userId).findFirst()
                 return firstOtherMember?.avatarUrl
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 2785ffe4cb..194134f45d 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
@@ -107,9 +107,8 @@ internal class RoomDisplayNameResolver @Inject constructor(
             name = when (otherMembersCount) {
                 0    -> {
                     // Get left members if any
-                    val leftMembersNames = roomMembers.queryRoomMembersEvent()
+                    val leftMembersNames = roomMembers.queryLeftRoomMembersEvent()
                             .findAll()
-                            .filter { it.membership == Membership.LEAVE }
                             .map { it.getBestName() }
                     roomDisplayNameFallbackProvider.getNameForEmptyRoom(roomSummary?.isDirect.orFalse(), leftMembersNames)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
index 2a7c46bd42..9ce8db25a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
@@ -75,6 +75,11 @@ internal class RoomMemberHelper(private val realm: Realm,
                 .equalTo(RoomMemberSummaryEntityFields.MEMBERSHIP_STR, Membership.INVITE.name)
     }
 
+    fun queryLeftRoomMembersEvent(): RealmQuery<RoomMemberSummaryEntity> {
+        return queryRoomMembersEvent()
+                .equalTo(RoomMemberSummaryEntityFields.MEMBERSHIP_STR, Membership.LEAVE.name)
+    }
+
     fun queryActiveRoomMembersEvent(): RealmQuery<RoomMemberSummaryEntity> {
         return queryRoomMembersEvent()
                 .beginGroup()