mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-02 00:25:10 -04:00
Optimized getEmailFromContactPicker()
This commit is contained in:
parent
2d13b0f36c
commit
3b5492f5fc
@ -195,34 +195,41 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
|
||||
@Override
|
||||
public ContactItem getEmailFromContactPicker(final Intent data) {
|
||||
Cursor cursor = null;
|
||||
Cursor cursor2 = null;
|
||||
ContactItem item = new ContactItem();
|
||||
ArrayList<String> email = new ArrayList<String>();
|
||||
|
||||
try {
|
||||
Uri result = data.getData();
|
||||
String displayName = null;
|
||||
|
||||
cursor = mContentResolver.query(result, null, null, null, null);
|
||||
if (cursor.moveToFirst()) {
|
||||
displayName = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME));
|
||||
}
|
||||
// Get the contact id from the Uri
|
||||
String id = result.getLastPathSegment();
|
||||
cursor2 = mContentResolver.query(Email.CONTENT_URI,
|
||||
null, Email.CONTACT_ID + "=?", new String[] { id },
|
||||
null);
|
||||
|
||||
if (cursor2 != null) {
|
||||
int emailIdx = cursor2.getColumnIndex(Email.DATA);
|
||||
cursor = mContentResolver.query(Email.CONTENT_URI, PROJECTION,
|
||||
Email.CONTACT_ID + "=?", new String[] { id }, null);
|
||||
|
||||
while (cursor2.moveToNext()) {
|
||||
email.add(cursor2.getString(emailIdx));
|
||||
if (cursor != null) {
|
||||
while (cursor.moveToNext()) {
|
||||
String address = cursor.getString(EMAIL_INDEX);
|
||||
if (address != null) {
|
||||
email.add(address);
|
||||
}
|
||||
|
||||
if (displayName == null) {
|
||||
displayName = cursor.getString(NAME_INDEX);
|
||||
}
|
||||
}
|
||||
|
||||
// Return 'null' if no email addresses have been found
|
||||
if (email.size() == 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Use the first email address found as display name
|
||||
if (displayName == null) {
|
||||
displayName = email.get(0);
|
||||
}
|
||||
|
||||
ContactItem item = new ContactItem();
|
||||
item.setDisplayName(displayName);
|
||||
item.setEmailAddresses(email);
|
||||
return item;
|
||||
@ -231,7 +238,6 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
|
||||
Log.e(K9.LOG_TAG, "Failed to get email data", e);
|
||||
} finally {
|
||||
Utility.closeQuietly(cursor);
|
||||
Utility.closeQuietly(cursor2);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
Loading…
Reference in New Issue
Block a user