From a0c55baf3914c27310ecd792c31677b39a4fd9f5 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 9 Feb 2026 11:40:29 -0500 Subject: [PATCH] Show whose safety number changed in group chat summaries. --- .../conversationlist/ConversationListItem.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java index dd4d8352f7..d6d5377651 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java @@ -662,12 +662,12 @@ public final class ConversationListItem extends ConstraintLayout implements Bind String time = ExpirationUtil.getExpirationDisplayValue(context, seconds); return emphasisAdded(context, context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time), Glyph.TIMER, defaultTint); } else if (MessageTypes.isIdentityUpdate(thread.getType())) { - return emphasisAdded(recipientToStringAsync(thread.getRecipient().getId(), r -> { - if (r.isGroup()) { - return new SpannableString(context.getString(R.string.ThreadRecord_safety_number_changed)); - } else { - return new SpannableString(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context))); - } + RecipientId individualRecipientId = thread.getIndividualRecipientId(); + if (individualRecipientId.isUnknown() || !thread.getRecipient().isGroup()) { + return emphasisAdded(context, context.getString(R.string.ThreadRecord_safety_number_changed), defaultTint); + } + return emphasisAdded(recipientToStringAsync(individualRecipientId, r -> { + return new SpannableString(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context))); })); } else if (MessageTypes.isIdentityVerified(thread.getType())) { return emphasisAdded(context, context.getString(R.string.ThreadRecord_you_marked_verified), defaultTint);