From 2945390842b14d7352c6f82cd82ccee0477323ef Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 4 Feb 2020 14:31:44 +1100 Subject: [PATCH] Quick fix closed group UI issues --- res/menu/conversation_push_group_options.xml | 4 ++-- .../securesms/GroupMembersDialog.java | 23 +++++++++---------- .../conversation/ConversationActivity.java | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/res/menu/conversation_push_group_options.xml b/res/menu/conversation_push_group_options.xml index 2a7f2713da..4c75406455 100644 --- a/res/menu/conversation_push_group_options.xml +++ b/res/menu/conversation_push_group_options.xml @@ -1,9 +1,9 @@ - + app:showAsAction="collapseActionView" /> --> > { @Override public void onClick(DialogInterface dialogInterface, int item) { - Recipient recipient = groupMembers.get(item); - - if (recipient.getContactUri() != null) { - Intent intent = new Intent(context, RecipientPreferenceActivity.class); - intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress()); - - context.startActivity(intent); - } else { - context.startActivity(RecipientExporter.export(recipient).asAddContactIntent()); - } + // Loki - Do nothing +// Recipient recipient = groupMembers.get(item); +// +// if (recipient.getContactUri() != null) { +// Intent intent = new Intent(context, RecipientPreferenceActivity.class); +// intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress()); +// +// context.startActivity(intent); +// } else { +// context.startActivity(RecipientExporter.export(recipient).asAddContactIntent()); +// } } } diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 34ee6efe26..4df60d9f3e 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -874,7 +874,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true; - case R.id.menu_edit_group: handleEditPushGroup(); return true; +// case R.id.menu_edit_group: handleEditPushGroup(); return true; case R.id.menu_leave: handleLeavePushGroup(); return true; case R.id.menu_invite: handleInviteLink(); return true; case R.id.menu_mute_notifications: handleMuteNotifications(); return true; @@ -2112,7 +2112,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void setGroupShareProfileReminder(@NonNull Recipient recipient) { if (recipient.isPushGroupRecipient() && !recipient.isProfileSharing() && !recipient.getAddress().isPublicChat() && !recipient.getAddress().isRSSFeed()) { groupShareProfileView.get().setRecipient(recipient); - groupShareProfileView.get().setVisibility(View.VISIBLE); + groupShareProfileView.get().setVisibility(View.GONE); // Loki - Always hide for now } else if (groupShareProfileView.resolved()) { groupShareProfileView.get().setVisibility(View.GONE); }