awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

avoid adding SELF twice

Browse Source
This commit is contained in:
B. Petersen
2018-04-20 23:17:14 +02:00
parent 8decc0176f
commit a0cd2d0a7c
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/messenger/ContactsActivity.java
+14 -3
View File
@@ -242,6 +242,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
result.addAll(selectedContacts.keySet());
Bundle args = new Bundle();
args.putIntegerArrayList("result", result);
args.putInt("do_what", do_what);
presentFragment(new GroupCreateFinalActivity(args));
}
}
@@ -268,8 +269,10 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
listViewAdapter = new ContactsAdapter(context, do_what==SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP? MrMailbox.MR_GCL_VERIFIED_ONLY : 0);
listViewAdapter.setCheckedMap(selectedContacts);
if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP || do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP ) {
listViewAdapter.setCheckedMap(selectedContacts);
}
fragmentView = new LinearLayout(context);
@@ -461,7 +464,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
span.uid = user.id;
ignoreChange = false;
}
actionBar.setSubtitle(context.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContacts.size(), selectedContacts.size()));
int selectedContactsButMe = selectedContacts.size();
if( selectedContacts.containsKey(MrContact.MR_CONTACT_ID_SELF) ) {
selectedContactsButMe--;
}
actionBar.setSubtitle(context.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContactsButMe, selectedContactsButMe));
if (searching || searchWas) {
ignoreChange = true;
SpannableStringBuilder ssb = new SpannableStringBuilder("");
@@ -697,7 +707,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
MrContact mrContact = MrMailbox.getContact(curr_user_id);
((UserCell) convertView).setData(mrContact);
if (checkedMap != null) {
((UserCell) convertView).setChecked(checkedMap.containsKey(curr_user_id), !scrolling);
boolean checked = curr_user_id==MrContact.MR_CONTACT_ID_SELF || checkedMap.containsKey(curr_user_id);
((UserCell) convertView).setChecked(checked, !scrolling);
}
}
MessengerProj/src/main/java/com/b44t/messenger/GroupCreateFinalActivity.java
+12 -3
View File
@@ -59,17 +59,26 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
private final static int done_button = 1;
int do_what; // values from ContactsActivity
public GroupCreateFinalActivity(Bundle args) {
super(args);
if( args != null ) {
do_what = args.getInt("do_what", 0);
selectedContacts = args.getIntegerArrayList("result"); /* may be empty - in this case a group only with SELF is created */
}
if( selectedContacts == null ) { selectedContacts = new ArrayList<>(); }
if( !selectedContacts.contains(MrContact.MR_CONTACT_ID_SELF) ) {
selectedContacts.add(MrContact.MR_CONTACT_ID_SELF);
}
}
@SuppressWarnings("unchecked")
@Override
public boolean onFragmentCreate() {
NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces);
selectedContacts = getArguments().getIntegerArrayList("result"); /* may be empty - in this case a group only with SELF is created */
if( selectedContacts == null ) { selectedContacts = new ArrayList<>(); }
selectedContacts.add(MrContact.MR_CONTACT_ID_SELF);
return super.onFragmentCreate();
}