diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-06-20 10:54:41 -0700 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-06-20 10:54:41 -0700 |
| commit | baca3253a2d4a3d9ec1b018a079c35d89dd1bdf2 (patch) | |
| tree | 58a4e9ee64f9addb551b1b40c19a6db3506732eb | |
| parent | 634e2134080aa47637c4a3eb2372644202da1e90 (diff) | |
| parent | c438c7b3b8a621c3aeccfeaa56f66935fdb1b177 (diff) | |
| download | android_frameworks_ex-baca3253a2d4a3d9ec1b018a079c35d89dd1bdf2.tar.gz android_frameworks_ex-baca3253a2d4a3d9ec1b018a079c35d89dd1bdf2.tar.bz2 android_frameworks_ex-baca3253a2d4a3d9ec1b018a079c35d89dd1bdf2.zip | |
Merge jb-ub-mail-ur10 into master
Change-Id: I37d9f0d0d2c8e72d59694c284d064070b615c60d
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java | 60 | ||||
| -rw-r--r-- | chips/src/com/android/ex/chips/RecipientEditTextView.java | 1 |
2 files changed, 34 insertions, 27 deletions
diff --git a/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java b/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java index 0693df2..ef34379 100644 --- a/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java +++ b/chips/src/com/android/ex/chips/RecipientAlternatesAdapter.java @@ -140,8 +140,12 @@ public class RecipientAlternatesAdapter extends CursorAdapter { try { directoryCursor = context.getContentResolver().query(DirectoryListQuery.URI, DirectoryListQuery.PROJECTION, null, null, null); - paramsList = BaseRecipientAdapter.setupOtherDirectories(context, directoryCursor, - account); + if (directoryCursor == null) { + paramsList = null; + } else { + paramsList = BaseRecipientAdapter.setupOtherDirectories(context, + directoryCursor, account); + } } finally { if (directoryCursor != null) { directoryCursor.close(); @@ -157,35 +161,37 @@ public class RecipientAlternatesAdapter extends CursorAdapter { matchesNotFound.addAll(unresolvedAddresses); - Cursor directoryContactsCursor = null; - for (String unresolvedAddress : unresolvedAddresses) { - for (int i = 0; i < paramsList.size(); i++) { - try { - directoryContactsCursor = doQuery(unresolvedAddress, 1, - paramsList.get(i).directoryId, account, - context.getContentResolver(), query); - } finally { - if (directoryContactsCursor != null - && directoryContactsCursor.getCount() == 0) { - directoryContactsCursor.close(); - directoryContactsCursor = null; - } else { - break; + if (paramsList != null) { + Cursor directoryContactsCursor = null; + for (String unresolvedAddress : unresolvedAddresses) { + for (int i = 0; i < paramsList.size(); i++) { + try { + directoryContactsCursor = doQuery(unresolvedAddress, 1, + paramsList.get(i).directoryId, account, + context.getContentResolver(), query); + } finally { + if (directoryContactsCursor != null + && directoryContactsCursor.getCount() == 0) { + directoryContactsCursor.close(); + directoryContactsCursor = null; + } else { + break; + } } } - } - if (directoryContactsCursor != null) { - try { - final Map<String, RecipientEntry> entries = - processContactEntries(directoryContactsCursor); + if (directoryContactsCursor != null) { + try { + final Map<String, RecipientEntry> entries = + processContactEntries(directoryContactsCursor); - for (final String address : entries.keySet()) { - matchesNotFound.remove(address); - } + for (final String address : entries.keySet()) { + matchesNotFound.remove(address); + } - callback.matchesFound(entries); - } finally { - directoryContactsCursor.close(); + callback.matchesFound(entries); + } finally { + directoryContactsCursor.close(); + } } } } diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java index d2e5806..aaf4a05 100644 --- a/chips/src/com/android/ex/chips/RecipientEditTextView.java +++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java @@ -2494,6 +2494,7 @@ public class RecipientEditTextView extends MultiAutoCompleteTextView implements } final BaseRecipientAdapter adapter = (BaseRecipientAdapter) getAdapter(); if (adapter == null) { + Log.wtf(TAG, "My assumption that this was fixed is wrong."); return null; } RecipientAlternatesAdapter.getMatchingRecipients(getContext(), addresses, |