commit b949f27d7815b10450c47ee8c00e078c45cf49aa
author Mindy Pereira <mindyp@google.com> Wed Apr 04 11:19:02 2012 -0700
committer Mindy Pereira <mindyp@google.com> Wed Apr 04 11:19:02 2012 -0700
tree 81083f08f87ff03e16945fd76bc6a08cb1a129a5
parent c6f1e2a8690bd3d4722a2e9386cdc98691135063

We don't seem to have settings in search.

Fix that later;
for now, fix the crash

Fixes b/6288564 NPE in opening the message from Search results

Change-Id: Ia16c693098e0a1d3a93ea1a786d702544a074b7b

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

diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 8898c00..298b070 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -58,6 +58,7 @@
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.ListParams;
 import com.android.mail.providers.Message;
+import com.android.mail.providers.Settings;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
 import com.android.mail.providers.UIProvider.FolderCapabilities;
@@ -353,11 +354,12 @@
             final boolean safeForImages = msg.alwaysShowImages /* || savedStateSaysSafe */;
             allowNetworkImages |= safeForImages;
 
+            Settings settings = mActivity.getSettings();
             final int headerPos = mAdapter
                     .addMessageHeader(
                             msg,
-                            (mActivity.getSettings().replyBehavior
-                                    == UIProvider.DefaultReplyBehavior.REPLY_ALL),
+                            (settings != null ? mActivity.getSettings().replyBehavior
+                                    == UIProvider.DefaultReplyBehavior.REPLY_ALL : false),
                             true /* expanded */);
             final MessageHeaderItem headerItem = (MessageHeaderItem) mAdapter.getItem(headerPos);