Skip to content

Commit

Permalink
Allow multiple user selection in "add users" contexts (close #892)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniele Ricci <[email protected]>
  • Loading branch information
daniele-athome committed Dec 9, 2016
1 parent 963c36c commit e35279c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/src/main/java/org/kontalk/ui/AbstractComposeFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/org/kontalk/ui/ContactsListActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit e35279c

Please sign in to comment.