commit 780fbf7b56959bbdd2b3346b2f92cabedd84b50e
author Paul Westbrook <pwestbro@google.com> Sun Apr 27 13:15:18 2014 -0700
committer Paul Westbrook <pwestbro@google.com> Sun Apr 27 13:15:18 2014 -0700
tree f4906e7aa1c581197e833765a9a86fb7d0ec936b
parent 33a5b4f6923946674e51980b64c1b4f340fecdf2

Prevent NPE with null cursor

Bug: 14360501
Change-Id: Idb86a00ce3e1d4f2ceb7a7dc33f8dc9058f13993

src/com/android/mail/ui/ConversationListFragment.java

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 03f87bf..510e870 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -1019,11 +1019,13 @@
         mConversationCursorHash = newCursorHash;
 
         updateAnalyticsData(newCursor);
-        updateSearchResultHeader(newCursor.getCount());
-
-        if (newCursor != null && newCursor.getCount() > 0) {
-            newCursor.markContentsSeen();
-            restoreLastScrolledPosition();
+        if (newCursor != null) {
+            final int newCursorCount = newCursor.getCount();
+            updateSearchResultHeader(newCursorCount);
+            if (newCursorCount > 0) {
+                newCursor.markContentsSeen();
+                restoreLastScrolledPosition();
+            }
         }
 
         // If a current conversation is available, and none is selected in the list, then ask