Fix left user has no name in db

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/ChunkEntityHelper.kt

@@ -123,17 +123,18 @@ private fun computeIsUnique(
         realm: Realm,
         roomId: String,
         isLastForward: Boolean,
-        myRoomMemberContent: RoomMemberContent,
+        senderRoomMemberContent: RoomMemberContent,
         roomMemberContentsByUser: Map<String, RoomMemberContent?>
 ): Boolean {
     val isHistoricalUnique = roomMemberContentsByUser.values.find {
-        it != myRoomMemberContent && it?.displayName == myRoomMemberContent.displayName
+        it != senderRoomMemberContent && it?.displayName == senderRoomMemberContent.displayName
     } == null
     return if (isLastForward) {
         val isLiveUnique = RoomMemberSummaryEntity
                 .where(realm, roomId)
-                .equalTo(RoomMemberSummaryEntityFields.DISPLAY_NAME, myRoomMemberContent.displayName)
+                .equalTo(RoomMemberSummaryEntityFields.DISPLAY_NAME, senderRoomMemberContent.displayName)
-                .findAll().none {
+                .findAll()
+                .none {
                     !roomMemberContentsByUser.containsKey(it.userId)
                 }
         isHistoricalUnique && isLiveUnique

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomMemberSummaryEntity.kt

@@ -24,7 +24,7 @@ import io.realm.annotations.PrimaryKey
 internal open class RoomMemberSummaryEntity(@PrimaryKey var primaryKey: String = "",
                                             @Index var userId: String = "",
                                             @Index var roomId: String = "",
-                                            var displayName: String? = null,
+                                            @Index var displayName: String? = null,
                                             var avatarUrl: String? = null,
                                             var reason: String? = null,
                                             var isDirect: Boolean = false

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMemberEventHandler.kt

@@ -30,8 +30,15 @@ internal class RoomMemberEventHandler @Inject constructor() {
         if (event.type != EventType.STATE_ROOM_MEMBER) {
             return false
         }
-        val roomMember = event.content.toModel<RoomMemberContent>() ?: return false
         val userId = event.stateKey ?: return false
+        val roomMember = event.content.toModel<RoomMemberContent>()
+        return handle(realm, roomId, userId, roomMember)
+    }
+
+    fun handle(realm: Realm, roomId: String, userId: String, roomMember: RoomMemberContent?): Boolean {
+        if (roomMember == null) {
+            return false
+        }
         val roomMemberEntity = RoomMemberEntityFactory.create(roomId, userId, roomMember)
         realm.insertOrUpdate(roomMemberEntity)
         if (roomMember.membership.isActive()) {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt

@@ -32,6 +32,7 @@ import im.vector.matrix.android.internal.database.helper.addOrUpdate
 import im.vector.matrix.android.internal.database.helper.addTimelineEvent
 import im.vector.matrix.android.internal.database.helper.deleteOnCascade
 import im.vector.matrix.android.internal.database.mapper.ContentMapper
+import im.vector.matrix.android.internal.database.mapper.asDomain
 import im.vector.matrix.android.internal.database.mapper.toEntity
 import im.vector.matrix.android.internal.database.model.ChunkEntity
 import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity
@@ -313,14 +314,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     root = eventEntity
                 }
                 if (event.type == EventType.STATE_ROOM_MEMBER) {
-                    roomMemberContentsByUser[event.stateKey] = event.content.toModel()
+                    val fixedContent = event.getFixedRoomMemberContent()
-                    roomMemberEventHandler.handle(realm, roomEntity.roomId, event)
+                    roomMemberContentsByUser[event.stateKey] = fixedContent
+                    roomMemberEventHandler.handle(realm, roomEntity.roomId, event.stateKey, fixedContent)
                 }
             }
             roomMemberContentsByUser.getOrPut(event.senderId) {
                 // If we don't have any new state on this user, get it from db
                 val rootStateEvent = CurrentStateEventEntity.getOrNull(realm, roomId, event.senderId, EventType.STATE_ROOM_MEMBER)?.root
-                ContentMapper.map(rootStateEvent?.content).toModel()
+                rootStateEvent?.asDomain()?.getFixedRoomMemberContent()
             }
 
             chunkEntity.addTimelineEvent(roomId, eventEntity, PaginationDirection.FORWARDS, roomMemberContentsByUser)
@@ -411,4 +413,19 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             }
         }
     }
+
+    private fun Event.getFixedRoomMemberContent(): RoomMemberContent?{
+        val content = content.toModel<RoomMemberContent>()
+        // if user is leaving, we should grab his last name and avatar from prevContent
+        return if (content?.membership?.isLeft() == true) {
+            val prevContent = resolvedPrevContent().toModel<RoomMemberContent>()
+            content.copy(
+                    displayName = prevContent?.displayName,
+                    avatarUrl = prevContent?.avatarUrl
+            )
+        } else {
+            content
+        }
+    }
+
 }