Skip to content

fix Easy Selector FC when you don't have any group #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aikons wants to merge 1 commit into
base: jb-mr1
Choose a base branch
from
+49 −15
Open

fix Easy Selector FC when you don't have any group #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 49 additions & 15 deletions src/com/android/mms/ui/AddRecipientsList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,27 +275,60 @@ private void initListAdapter() {

// For each PhoneNumber, find its GID, and add it to correct Group
int phoneNumbersCount = mPhoneNumbers.size();
int groupsCount = mGroups.size();

for (int i = 0; i < phoneNumbersCount; i++) {
PhoneNumber phoneNumber = mPhoneNumbers.get(i);
long cid = phoneNumber.getContactId();

Iterator<Long> iterator = groupIdWithContactsId.keySet().iterator();
while (iterator.hasNext()) {
long gid = (Long)iterator.next();
if (groupIdWithContactsId.get(gid).contains(cid)) {
for (int j = 0; j < groupsCount; j++) {
Group group = mGroups.get(j);
if (group.getId() == gid) {
group.addPhoneNumber(phoneNumber);
phoneNumber.addGroup(group);
if (mGroups == null) {
int groupsCount = 0;
for (int i = 0; i < phoneNumbersCount; i++) {
PhoneNumber phoneNumber = mPhoneNumbers.get(i);
long cid = phoneNumber.getContactId();

Iterator<Long> iterator = groupIdWithContactsId.keySet().iterator();
while (iterator.hasNext()) {
long gid = (Long)iterator.next();
if (groupIdWithContactsId.get(gid).contains(cid)) {
for (int j = 0; j < groupsCount; j++) {
Group group = mGroups.get(j);
if (group.getId() == gid) {
group.addPhoneNumber(phoneNumber);
phoneNumber.addGroup(group);
}
}
}
}
}
ArrayList<AddRecipientsListItem> items = new ArrayList<AddRecipientsListItem>();
for (int i = 0; i < groupsCount; i++) {
Group group = mGroups.get(i);
items.add(i, new AddRecipientsListItem(this, group));
}

for (int i = 0; i < phoneNumbersCount; i++) {
PhoneNumber phoneNumber = mPhoneNumbers.get(i);
items.add(i + groupsCount, new AddRecipientsListItem(this, phoneNumber));
}
mListAdapter = new AddRecipientsListAdapter(this, items);
setListAdapter(mListAdapter);
}
else{
int groupsCount = mGroups.size();
for (int i = 0; i < phoneNumbersCount; i++) {
PhoneNumber phoneNumber = mPhoneNumbers.get(i);
long cid = phoneNumber.getContactId();

Iterator<Long> iterator = groupIdWithContactsId.keySet().iterator();
while (iterator.hasNext()) {
long gid = (Long)iterator.next();
if (groupIdWithContactsId.get(gid).contains(cid)) {
for (int j = 0; j < groupsCount; j++) {
Group group = mGroups.get(j);
if (group.getId() == gid) {
group.addPhoneNumber(phoneNumber);
phoneNumber.addGroup(group);
}
}
}
}
}
ArrayList<AddRecipientsListItem> items = new ArrayList<AddRecipientsListItem>();
for (int i = 0; i < groupsCount; i++) {
Group group = mGroups.get(i);
Expand All @@ -306,9 +339,10 @@ private void initListAdapter() {
PhoneNumber phoneNumber = mPhoneNumbers.get(i);
items.add(i + groupsCount, new AddRecipientsListItem(this, phoneNumber));
}

mListAdapter = new AddRecipientsListAdapter(this, items);
setListAdapter(mListAdapter);
}

}

@Override
Expand Down