From 44bfa514a5dc78a57ecd3b29daf37c248ce6603a Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Tue, 15 Apr 2025 11:05:46 -0400 Subject: [PATCH] Fix member count description. --- .../securesms/conversation/v2/ConversationAdapterV2.kt | 10 +++++----- .../messagerequests/MessageRequestRepository.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt index b7e7f03ccf..6246968df8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt @@ -642,14 +642,14 @@ class ConversationAdapterV2( val names = members.map { member -> member.getDisplayName(context) } val otherMembers = if (size > 3) context.resources.getQuantityString(R.plurals.MessageRequestProfileView_other_members, size - 3, size - 3) else null val membersSubtitle = if (recipient.isActiveGroup) { - when (size) { - 1 -> context.getString(R.string.MessageRequestProfileView_group_members_zero) - 2 -> context.getString(R.string.MessageRequestProfileView_group_members_one_and_you, names[0]) - 3 -> context.getString(R.string.MessageRequestProfileView_group_members_two_and_you, names[0], names[1]) + when (names.size) { + 0 -> context.getString(R.string.MessageRequestProfileView_group_members_zero) + 1 -> context.getString(R.string.MessageRequestProfileView_group_members_one_and_you, names[0]) + 2 -> context.getString(R.string.MessageRequestProfileView_group_members_two_and_you, names[0], names[1]) else -> context.getString(R.string.MessageRequestProfileView_group_members_other, names[0], names[1], names[2], otherMembers) } } else { - when (size) { + when (names.size) { 0 -> context.getString(R.string.MessageRequestProfileView_group_members_zero) 1 -> context.getString(R.string.MessageRequestProfileView_group_members_one, names[0]) 2 -> context.getString(R.string.MessageRequestProfileView_group_members_two, names[0], names[1]) diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java index 0442e1439b..de698a2852 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java @@ -51,7 +51,7 @@ public final class MessageRequestRepository { private static final String TAG = Log.tag(MessageRequestRepository.class); private static final int MIN_GROUPS_THRESHOLD = 2; - private static final int MAX_MEMBER_NAMES = 3; + private static final int MAX_MEMBER_NAMES = 4; private final Context context; private final Executor executor;