commit d7800ac943b8e5adfe82b278fc2f7967c7192d77
author Flavio Lerda <flerda@google.com> Mon Jun 13 09:54:19 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 13 09:54:19 2011 -0700
tree c29899fff520a1936e287feeee844b1c783e6d3c
parent 3edcde503bf75781d2e69298da941ce6ebf6cfb1
parent ac36f9f02079328fa55fdb7bbe498bc1d1cc2b64

Merge "If the loader is cancelled, show an empty list."

src/com/android/contacts/list/StrequentAdapter.java

diff --git a/src/com/android/contacts/list/StrequentAdapter.java b/src/com/android/contacts/list/StrequentAdapter.java
index 4c6109a..fc7a944 100644
--- a/src/com/android/contacts/list/StrequentAdapter.java
+++ b/src/com/android/contacts/list/StrequentAdapter.java
@@ -61,20 +61,24 @@
         mAllEntries = new ArrayList<StrequentEntry>();
         mMostFrequentCount = mStarredCount = 0;
 
-        while (cursor.moveToNext()) {
-            StrequentEntry contact = new StrequentEntry();
+        // If the loader was canceled we will be given a null cursor.
+        // In that case, show an empty list of contacts.
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                StrequentEntry contact = new StrequentEntry();
 
-            contact.id = cursor.getLong(StrequentMetaDataLoader.CONTACT_ID);
-            contact.photoId = cursor.getLong(StrequentMetaDataLoader.PHOTO_ID);
-            contact.name = cursor.getString(StrequentMetaDataLoader.DISPLAY_NAME);
+                contact.id = cursor.getLong(StrequentMetaDataLoader.CONTACT_ID);
+                contact.photoId = cursor.getLong(StrequentMetaDataLoader.PHOTO_ID);
+                contact.name = cursor.getString(StrequentMetaDataLoader.DISPLAY_NAME);
 
-            // Adding Starred Contact
-            if (cursor.getInt(StrequentMetaDataLoader.STARRED) == 1) {
-                mStarredCount++;
-            } else {
-                mMostFrequentCount++;
+                // Adding Starred Contact
+                if (cursor.getInt(StrequentMetaDataLoader.STARRED) == 1) {
+                    mStarredCount++;
+                } else {
+                    mMostFrequentCount++;
+                }
+                mAllEntries.add(contact);
             }
-            mAllEntries.add(contact);
         }
         this.notifyDataSetChanged();
     }