Fix disambiguated with empty senderName

2019-10-30 19:25:24 +01:00 · 2019-10-30 19:25:24 +01:00 · 101057520b
commit 101057520b
parent 035359cb35
1 changed files with 6 additions and 13 deletions
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
@ -62,17 +62,10 @@ data class TimelineEvent(
    }

    fun getDisambiguatedDisplayName(): String {
-        val disambiguated = if (isUniqueDisplayName) {
-            senderName
-        } else {
-            senderName?.let { name ->
-                "$name (${root.senderId})"
-            }
-        }
-        return if (disambiguated.isNullOrBlank()) {
-            root.senderId ?: ""
-        } else {
-            disambiguated
+        return when {
+            senderName.isNullOrBlank() -> root.senderId ?: ""
+            isUniqueDisplayName        -> senderName
+            else                       -> "$senderName (${root.senderId})"
        }
    }