From eb1512b89084316a6197ee458a060d16372999e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Fri, 3 Dec 2021 11:24:03 +0100 Subject: [PATCH 1/2] Show quotes of unnamed guests with "Guests" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this change the default "Guests" label only was set if the actor display name was 'null'. Resolves: #1730 Signed-off-by: Tim Krüger --- .../adapters/messages/MagicIncomingTextMessageViewHolder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt index 37c713449..dedf8d3cb 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt +++ b/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 From 1db35c903075c44bfb98a14cb52508d8a4e556d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Fri, 3 Dec 2021 14:29:59 +0100 Subject: [PATCH 2/2] Increment allowed warnings by one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The number of warnings increased because of a new version of 'com.google.android.exoplayer:exoplayer' is available. But the new version enforces SDK 31. Signed-off-by: Tim Krüger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index de06c6be4..7d0dd5fec 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 1 error and 223 warnings + Lint Report: 1 error and 224 warnings