From ca37a884fd8b95ff296f768004bce917870beeeb Mon Sep 17 00:00:00 2001 From: jeffrey-signal Date: Mon, 2 Mar 2026 10:33:55 -0500 Subject: [PATCH] Delete unused GroupMembersDialog. --- .../securesms/GroupMembersDialog.java | 59 ------------------- .../conversation/ConversationOptionsMenu.kt | 5 -- .../conversation/v2/ConversationFragment.kt | 6 -- .../drawable/ic_group_solid_highlight_24.xml | 9 --- .../res/menu/conversation_group_options.xml | 9 --- app/src/main/res/values/strings.xml | 2 - 6 files changed, 90 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java delete mode 100644 app/src/main/res/drawable/ic_group_solid_highlight_24.xml delete mode 100644 app/src/main/res/menu/conversation_group_options.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java deleted file mode 100644 index 8f33d8ad77..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.thoughtcrime.securesms; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; -import androidx.lifecycle.LiveData; - -import com.google.android.material.dialog.MaterialAlertDialogBuilder; - -import org.thoughtcrime.securesms.groups.LiveGroup; -import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry; -import org.thoughtcrime.securesms.groups.ui.GroupMemberListView; -import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment; - -import java.util.List; - -public final class GroupMembersDialog { - - private final FragmentActivity fragmentActivity; - private final Recipient groupRecipient; - - public GroupMembersDialog(@NonNull FragmentActivity activity, - @NonNull Recipient groupRecipient) - { - this.fragmentActivity = activity; - this.groupRecipient = groupRecipient; - } - - public void display() { - AlertDialog dialog = new MaterialAlertDialogBuilder(fragmentActivity) - .setTitle(R.string.ConversationActivity_group_members) - .setIcon(R.drawable.ic_group_24) - .setCancelable(true) - .setView(R.layout.dialog_group_members) - .setPositiveButton(android.R.string.ok, null) - .show(); - - GroupMemberListView memberListView = dialog.findViewById(R.id.list_members); - memberListView.initializeAdapter(fragmentActivity); - - LiveGroup liveGroup = new LiveGroup(groupRecipient.requireGroupId()); - LiveData> fullMembers = liveGroup.getFullMembers(); - - //noinspection ConstantConditions - fullMembers.observe(fragmentActivity, memberListView::setMembers); - - dialog.setOnDismissListener(d -> fullMembers.removeObservers(fragmentActivity)); - - memberListView.setRecipientClickListener(recipient -> { - dialog.dismiss(); - contactClick(recipient); - }); - } - - private void contactClick(@NonNull Recipient recipient) { - RecipientBottomSheetDialogFragment.show(fragmentActivity.getSupportFragmentManager(), recipient.getId(), groupRecipient.requireGroupId()); - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt index a0d3f7f2c1..5818087ac2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt @@ -126,7 +126,6 @@ internal object ConversationOptionsMenu { hideMenuItem(menu, R.id.menu_video_secure) } } - menuInflater.inflate(R.menu.conversation_group_options, menu) menuInflater.inflate(R.menu.conversation_active_group_options, menu) } @@ -164,8 +163,6 @@ internal object ConversationOptionsMenu { hideMenuItem(menu, R.id.menu_add_shortcut) } - hideMenuItem(menu, R.id.menu_group_recipients) - if (isActiveV2Group) { hideMenuItem(menu, R.id.menu_mute_notifications) hideMenuItem(menu, R.id.menu_conversation_settings) @@ -206,7 +203,6 @@ internal object ConversationOptionsMenu { R.id.menu_add_shortcut -> callback.handleAddShortcut() R.id.menu_search -> callback.handleSearch() R.id.menu_add_to_contacts -> callback.handleAddToContacts() - R.id.menu_group_recipients -> callback.handleDisplayGroupRecipients() R.id.menu_group_settings -> callback.handleManageGroup() R.id.menu_leave -> callback.handleLeavePushGroup() R.id.menu_invite -> callback.handleInviteLink() @@ -276,7 +272,6 @@ internal object ConversationOptionsMenu { fun handleAddShortcut() fun handleSearch() fun handleAddToContacts() - fun handleDisplayGroupRecipients() fun handleManageGroup() fun handleLeavePushGroup() fun handleInviteLink() diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt index 8c26fee901..aad652b320 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt @@ -125,7 +125,6 @@ import org.signal.core.util.setActionItemTint import org.signal.donations.InAppPaymentType import org.signal.ringrtc.CallLinkRootKey import org.thoughtcrime.securesms.BlockUnblockDialog -import org.thoughtcrime.securesms.GroupMembersDialog import org.thoughtcrime.securesms.MainActivity import org.thoughtcrime.securesms.MuteDialog import org.thoughtcrime.securesms.R @@ -3973,11 +3972,6 @@ class ConversationFragment : ) } - override fun handleDisplayGroupRecipients() { - val recipientSnapshot = viewModel.recipientSnapshot?.takeIf { it.isGroup } ?: return - GroupMembersDialog(requireActivity(), recipientSnapshot).display() - } - override fun handleManageGroup() { val recipient = viewModel.recipientSnapshot ?: return val intent = ConversationSettingsActivity.forGroup(requireContext(), recipient.requireGroupId()) diff --git a/app/src/main/res/drawable/ic_group_solid_highlight_24.xml b/app/src/main/res/drawable/ic_group_solid_highlight_24.xml deleted file mode 100644 index c969ca0a69..0000000000 --- a/app/src/main/res/drawable/ic_group_solid_highlight_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/menu/conversation_group_options.xml b/app/src/main/res/menu/conversation_group_options.xml deleted file mode 100644 index c1dc37e350..0000000000 --- a/app/src/main/res/menu/conversation_group_options.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9315a921d4..62f223fc8f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -488,7 +488,6 @@ Recipient is not a valid SMS or email address! Message is empty! - Group members Edits can only be applied within %1$d hour from the time you sent this message. @@ -4645,7 +4644,6 @@ - Recipients list Delivery Chat