mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-02 08:23:00 +01:00
Delete unused GroupMembersDialog.
This commit is contained in:
jeffrey-signal
committed by
Greyson Parrelli
Greyson Parrelli
parent
9fbb7683bc
commit
ca37a884fd
@@ -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<List<GroupMemberEntry.FullMember>> 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());
|
||||
}
|
||||
}
|
||||
@@ -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()
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@color/signal_text_toolbar_subtitle"
|
||||
android:pathData="M10.25,16.25m-2.5,-8.5a3.5,3.5 0,1 0,3.5 3.5A3.5,3.5 0,0 0,7.75 7.75ZM11.289,14.777a4.988,4.988 0,0 1,-7.078 0A4.735,4.735 0,0 0,1 19.25L1,20a1,1 0,0 0,1 1L13.5,21a1,1 0,0 0,1 -1v-0.75A4.735,4.735 0,0 0,11.289 14.777ZM16.25,2.75a3.5,3.5 0,1 0,3.5 3.5A3.5,3.5 0,0 0,16.25 2.75ZM19.789,9.777a4.989,4.989 0,0 1,-7.074 0.005c-0.063,0.022 -0.131,0.033 -0.193,0.057a4.675,4.675 0,0 1,-0.333 3.663A6.294,6.294 0,0 1,15.078 16L22,16a1,1 0,0 0,1 -1v-0.75A4.735,4.735 0,0 0,19.789 9.777Z"/>
|
||||
</vector>
|
||||
@@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item android:title="@string/convesation_group_options__recipients_list"
|
||||
android:id="@+id/menu_group_recipients"
|
||||
android:icon="@drawable/ic_group_solid_highlight_24"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
</menu>
|
||||
@@ -488,7 +488,6 @@
|
||||
<!-- Toast shown when user is unable to find the recipient when sending a message -->
|
||||
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
|
||||
<string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
|
||||
<string name="ConversationActivity_group_members">Group members</string>
|
||||
<!-- Warning dialog text shown to user if they try to send a message edit that is too old where %1$d is replaced with the amount of hours, e.g. 3 -->
|
||||
<plurals name="ConversationActivity_edit_message_too_old">
|
||||
<item quantity="one">Edits can only be applied within %1$d hour from the time you sent this message.</item>
|
||||
@@ -4645,7 +4644,6 @@
|
||||
</plurals>
|
||||
|
||||
<!-- conversation_group_options -->
|
||||
<string name="convesation_group_options__recipients_list">Recipients list</string>
|
||||
<string name="conversation_group_options__delivery">Delivery</string>
|
||||
<!-- Label for a menu item that appears after pressing the three-dot icon in a -->
|
||||
<string name="conversation_group_options__conversation">Chat</string>
|
||||
|
||||
Reference in New Issue
Block a user