From c608a05270d80cf471ddf4f16b4d969084743133 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Mon, 14 Sep 2020 13:43:59 -0300 Subject: [PATCH] Prevent a resolve call in main. --- .../conversationlist/ConversationListItem.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 538f9a25a..491583ad3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java @@ -453,11 +453,13 @@ public final class ConversationListItem extends RelativeLayout String time = ExpirationUtil.getExpirationDisplayValue(context, seconds); return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time)); } else if (SmsDatabase.Types.isIdentityUpdate(thread.getType())) { - if (thread.getRecipient().isGroup()) { - return emphasisAdded(context.getString(R.string.ThreadRecord_safety_number_changed)); - } else { - return emphasisAdded(recipientToStringAsync(thread.getRecipient().getId(), r -> context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context)))); - } + return emphasisAdded(recipientToStringAsync(thread.getRecipient().getId(), r -> { + if (r.isGroup()) { + return context.getString(R.string.ThreadRecord_safety_number_changed); + } else { + return context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context)); + } + })); } else if (SmsDatabase.Types.isIdentityVerified(thread.getType())) { return emphasisAdded(context.getString(R.string.ThreadRecord_you_marked_verified)); } else if (SmsDatabase.Types.isIdentityDefault(thread.getType())) {