From 8a89cf1358a153ed5e990047f0603e645e451cff Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 8 Feb 2023 20:39:08 -0500 Subject: [PATCH] Only use local label if there isn't a custom one --- src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 5b66d31508bc075a2a88900326ee5bac4c07606f..9fd2739ac092f2094441b34765187392adce1f2c 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -2189,7 +2189,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl tv.setGravity(Gravity.CENTER); tv.setText(getItem(position).second); int resId = ctx.getResources().getIdentifier("action_" + getItem(position).first, "string" , ctx.getPackageName()); - if (resId != 0) tv.setText(ctx.getResources().getString(resId)); + if (resId != 0 && getItem(position).second.equals(getItem(position).first)) tv.setText(ctx.getResources().getString(resId)); tv.setTextColor(ContextCompat.getColor(ctx, R.color.white)); tv.setBackgroundColor(UIHelper.getColorForName(getItem(position).first)); return v;