commit a543c3ecd4e4b9e5e7faa36c5184a777bdd9d924
author Mindy Pereira <mindyp@google.com> Wed Apr 04 11:19:02 2012 -0700
committer Mindy Pereira <mindyp@google.com> Wed Apr 04 11:26:14 2012 -0700
tree 7d944c7aeef09d8600f38793b323474979a15c64
parent b949f27d7815b10450c47ee8c00e078c45cf49aa

Make sure we load settings even when searching.

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

Change-Id: Idef014dde9c033028d2ffe28736bde630e9ba120

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

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index fb45614..bb907c8 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -834,6 +834,7 @@
                 mAccount = ((Account) intent.getParcelableExtra(Utils.EXTRA_ACCOUNT));
                 mActionBarView.setAccount(mAccount);
                 fetchSearchFolder(intent);
+                restartOptionalLoader(LOADER_ACCOUNT_SETTINGS, null /* args */);
             }
         }
 

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