Fix display name bug

5 years ago · 86ea104e01
parent 4075603714
commit 86ea104e01
2 changed files with 2 additions and 2 deletions
--- a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
@ -65,7 +65,7 @@ class ProfilePictureView : RelativeLayout {
                if (result == null && publicChat != null) {
                    result = DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, publicKey)
                }
-                return result
+                return result ?: publicKey
            }
        }
        if (recipient.isGroupRecipient) {
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@ -59,7 +59,7 @@ class UserView : LinearLayout {
                if (result == null && publicChat != null) {
                    result = DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, publicKey)
                }
-                return result
+                return result ?: publicKey
            }
        }
        val address = user.address.serialize()