From e35279c4cd1bef3605a799b3db07231d56619887 Mon Sep 17 00:00:00 2001 From: Daniele Ricci Date: Sat, 10 Dec 2016 00:35:50 +0100 Subject: [PATCH] Allow multiple user selection in "add users" contexts (close #892) Signed-off-by: Daniele Ricci --- .../main/java/org/kontalk/ui/AbstractComposeFragment.java | 2 ++ app/src/main/java/org/kontalk/ui/ContactsListActivity.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/kontalk/ui/AbstractComposeFragment.java b/app/src/main/java/org/kontalk/ui/AbstractComposeFragment.java index dc5169ecf..842e064a8 100644 --- a/app/src/main/java/org/kontalk/ui/AbstractComposeFragment.java +++ b/app/src/main/java/org/kontalk/ui/AbstractComposeFragment.java @@ -898,6 +898,8 @@ private void chooseContact() { // TODO one day it will be like this // Intent i = new Intent(Intent.ACTION_PICK, Users.CONTENT_URI); Intent i = new Intent(getContext(), ContactsListActivity.class); + i.putExtra(ContactsListActivity.MODE_MULTI_SELECT, true); + i.putExtra(ContactsListActivity.MODE_ADD_USERS, true); startActivityForResult(i, REQUEST_INVITE_USERS); } diff --git a/app/src/main/java/org/kontalk/ui/ContactsListActivity.java b/app/src/main/java/org/kontalk/ui/ContactsListActivity.java index b5b390070..b9c918c45 100644 --- a/app/src/main/java/org/kontalk/ui/ContactsListActivity.java +++ b/app/src/main/java/org/kontalk/ui/ContactsListActivity.java @@ -42,6 +42,7 @@ public class ContactsListActivity extends ToolbarActivity public static final String TAG = ContactsListActivity.class.getSimpleName(); public static final String MODE_MULTI_SELECT = "org.kontalk.contacts.MULTI_SELECT"; + public static final String MODE_ADD_USERS = "org.kontalk.contacts.ADD_USERS"; private ContactsListFragment mFragment; @@ -54,9 +55,11 @@ public void onCreate(Bundle savedInstanceState) { setupToolbar(true); boolean multiselect = getIntent().getBooleanExtra(MODE_MULTI_SELECT, false); - if (multiselect) + if (multiselect) { + boolean addUsers = getIntent().getBooleanExtra(MODE_ADD_USERS, false); // FIXME using another string - setTitle(R.string.action_compose_group); + setTitle(addUsers ? R.string.menu_invite_group : R.string.action_compose_group); + } if (savedInstanceState == null) { mFragment = ContactsListFragment.newInstance(multiselect);