From 3bf10861d295eb6802d0e85ecf6ac6931ed9e0a8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 30 Oct 2024 10:48:43 +0100 Subject: [PATCH] fixup: no need to split string twice --- .../ui/adapter/ConversationAdapter.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 80c0c7eea449ca7ce7d11176543ad7e0e67258b4..3bcb8286f38f6d55663609d3cd086beb52885cb1 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -183,17 +183,22 @@ public class ConversationAdapter if (status == Message.STATUS_RECEIVED) { if (conversation.getMode() == Conversation.MODE_MULTI) { viewHolder.binding.senderName.setVisibility(View.VISIBLE); - String display = UIHelper.getMessageDisplayName(message); + final var displayName = UIHelper.getMessageDisplayName(message); + final var displayNameParts = displayName.split("\\s+"); // Skip when nickname only consists of blank chars - if (display.split("\\s+").length != 0) - display = display.split("\\s+")[0]; - viewHolder.binding.senderName.setText(display + ':'); + if (displayNameParts.length == 0) { + viewHolder.binding.senderName.setText(String.format("%s:", displayName)); + } else { + viewHolder.binding.senderName.setText( + String.format("%s:", displayNameParts[0])); + } } else { viewHolder.binding.senderName.setVisibility(View.GONE); } } else if (message.getType() != Message.TYPE_STATUS) { viewHolder.binding.senderName.setVisibility(View.VISIBLE); - viewHolder.binding.senderName.setText(activity.getString(R.string.me) + ':'); + viewHolder.binding.senderName.setText( + String.format("%s:", activity.getString(R.string.me))); } else { viewHolder.binding.senderName.setVisibility(View.GONE); }