Browse Source

Merge pull request #1733 from nextcloud/bugfix/1730/guests-without-names-quotes

Show quotes of unnamed guests with "Guests"
Tim Krueger 3 years ago
parent
commit
acd0bb7cd5

+ 2 - 2
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt

@@ -211,8 +211,8 @@ class MagicIncomingTextMessageViewHolder(itemView: View, payload: Any) : Message
             } ?: run {
                 binding.messageQuote.quotedMessageImage.visibility = View.GONE
             }
-            binding.messageQuote.quotedMessageAuthor.text = parentChatMessage.actorDisplayName
-                ?: context!!.getText(R.string.nc_nick_guest)
+            binding.messageQuote.quotedMessageAuthor.text = if (parentChatMessage.actorDisplayName.isNullOrEmpty())
+                context!!.getText(R.string.nc_nick_guest) else parentChatMessage.actorDisplayName
             binding.messageQuote.quotedMessage.text = parentChatMessage.text
 
             binding.messageQuote.quotedMessageAuthor

+ 1 - 1
scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 error and 223 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 224 warnings</span>