From e8e100a72ef8a8571ecab8069788f588232de7e5 Mon Sep 17 00:00:00 2001 From: chklump Date: Sun, 6 Jan 2019 14:19:51 +0100 Subject: [PATCH 1/2] * Initialize the ContactSelectionListFragment with the selection from GroupCreateActivity, tackles #47. * If contact is unselected in ContactSelectionListFragment, which was previously in the group, delete it from GroupCreateActivity, also. --- .../securesms/ContactSelectionListFragment.java | 6 ++++++ .../thoughtcrime/securesms/GroupCreateActivity.java | 13 +++++++++++++ .../securesms/util/SelectedRecipientsAdapter.java | 5 +++++ 3 files changed, 24 insertions(+) diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 906a8a271..5d2cc8153 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -61,6 +61,7 @@ import org.thoughtcrime.securesms.util.StickyHeaderDecoration; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -83,6 +84,7 @@ public class ContactSelectionListFragment extends Fragment public static final String RECENTS = "recents"; public static final String SELECT_VERIFIED_EXTRA = "select_verified"; public static final String FROM_SHARE_ACTIVITY_EXTRA = "from_share_activity"; + public static final String PRESELECTED_CONTACTS = "preselected_contacts"; private ApplicationDcContext dcContext; @@ -243,6 +245,10 @@ public class ContactSelectionListFragment extends Fragment isMulti(), true); selectedContacts = adapter.getSelectedContacts(); + ArrayList preselectedContacts = getActivity().getIntent().getStringArrayListExtra(PRESELECTED_CONTACTS); + if(preselectedContacts!=null) { + selectedContacts.addAll(preselectedContacts); + } recyclerView.setAdapter(adapter); recyclerView.addItemDecoration(new StickyHeaderDecoration(adapter, true, true)); } diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index d6413a96f..55fd2c6b8 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -62,6 +62,7 @@ import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; import org.thoughtcrime.securesms.util.guava.Optional; import java.io.File; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -151,6 +152,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity } private void addSelectedContacts(@NonNull Recipient... recipients) { + getAdapter().clear(); new AddMembersTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, recipients); } @@ -421,6 +423,17 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity public void onClick(View v) { Intent intent = new Intent(GroupCreateActivity.this, ContactMultiSelectionActivity.class); intent.putExtra(ContactSelectionListFragment.SELECT_VERIFIED_EXTRA, verified); + if(editGroupChatId!=null) { + Recipient recipient = GroupCreateActivity.this.dcContext.getRecipient(ApplicationDcContext.RECIPIENT_TYPE_CHAT, editGroupChatId); + List participants = recipient.getParticipants(); + ArrayList preselectedContacts = new ArrayList<>(); + for (Recipient p : participants) { + if(p.getAddress().isDcContact()) { + preselectedContacts.add(dcContext.getContact(p.getAddress().getDcContactId()).getAddr()); + } + } + intent.putExtra(ContactSelectionListFragment.PRESELECTED_CONTACTS, preselectedContacts); + } startActivityForResult(intent, PICK_CONTACT); } } diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java index cc98a85e4..87842cf37 100644 --- a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java +++ b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java @@ -67,6 +67,11 @@ public class SelectedRecipientsAdapter extends BaseAdapter { } } + public void clear() { + recipients.clear(); + notifyDataSetChanged(); + } + public Set getRecipients() { final Set recipientSet = new HashSet<>(recipients.size()); for (RecipientWrapper wrapper : recipients) { From 27c6c3ab696f1332363b5551d365adc276e9af3b Mon Sep 17 00:00:00 2001 From: chklump Date: Sun, 6 Jan 2019 14:38:07 +0100 Subject: [PATCH 2/2] * Initialize the ContactSelectionListFragment from the SelectedRecipientsAdapter intead of from the initial group, so repeated opening, selecting and deselecting, closing cycles of the ContactMultiSelectionActivity show correct behaviour. --- .../securesms/GroupCreateActivity.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index 55fd2c6b8..c7b950565 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -423,17 +423,14 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity public void onClick(View v) { Intent intent = new Intent(GroupCreateActivity.this, ContactMultiSelectionActivity.class); intent.putExtra(ContactSelectionListFragment.SELECT_VERIFIED_EXTRA, verified); - if(editGroupChatId!=null) { - Recipient recipient = GroupCreateActivity.this.dcContext.getRecipient(ApplicationDcContext.RECIPIENT_TYPE_CHAT, editGroupChatId); - List participants = recipient.getParticipants(); - ArrayList preselectedContacts = new ArrayList<>(); - for (Recipient p : participants) { - if(p.getAddress().isDcContact()) { - preselectedContacts.add(dcContext.getContact(p.getAddress().getDcContactId()).getAddr()); - } + ArrayList preselectedContacts = new ArrayList<>(); + Set recipients = GroupCreateActivity.this.getAdapter().getRecipients(); + for (Recipient r : recipients) { + if(r.getAddress().isDcContact()) { + preselectedContacts.add(dcContext.getContact(r.getAddress().getDcContactId()).getAddr()); } - intent.putExtra(ContactSelectionListFragment.PRESELECTED_CONTACTS, preselectedContacts); } + intent.putExtra(ContactSelectionListFragment.PRESELECTED_CONTACTS, preselectedContacts); startActivityForResult(intent, PICK_CONTACT); } }