commit cd75eef4de0ae822e565bf0011092c8ab6b717e9
author Marc Blank <mblank@google.com> Tue Oct 04 13:41:08 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 04 13:41:08 2011 -0700
tree bb6a838fe3f582681497ad3438a8eea7ef524e37
parent 1c4b62a0edb459fc37cae239c968eaa599c82cef
parent bcf5d5825fe69bf8bd7edfd077027a52abd2c8eb

Merge "Handle possible NPE in MessageListItem"

src/com/android/email/activity/MessageListFragment.java

diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java
index 2681edb..d65b8e0 100644
--- a/src/com/android/email/activity/MessageListFragment.java
+++ b/src/com/android/email/activity/MessageListFragment.java
@@ -1285,6 +1285,9 @@
             }
             MessagesAdapter.MessagesCursor cursor = (MessagesAdapter.MessagesCursor) c;
 
+            // Update the list
+            mListAdapter.swapCursor(cursor);
+
             if (!cursor.mIsFound) {
                 mCallback.onMailboxNotFound();
                 return;
@@ -1315,9 +1318,6 @@
                 mListAdapter.setShowColorChips(isCombinedMailbox() && mCountTotalAccounts > 1);
             }
 
-            // Update the list
-            mListAdapter.swapCursor(cursor);
-
             // Various post processing...
             updateSearchHeader(cursor);
             autoRefreshStaleMailbox();