commit b0d82fecff0036a774f067a0389a1b0a834f8bff
author Tony Mantler <nicoya@google.com> Thu Oct 31 10:36:24 2013 -0700
committer Tony Mantler <nicoya@google.com> Thu Oct 31 10:43:29 2013 -0700
tree 84b5a2fc6cb3170740fb005a09c4240237e28c6a
parent 3e8e59798b718e034da8c250e706e6429c41c2a5

Don't add Quick Response menu if there's no mReplyFromAccount

b/11361756

Change-Id: I880d8f2089c1a50d13367b6fcf64344070280e27

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

diff --git a/src/com/android/email/activity/ComposeActivityEmail.java b/src/com/android/email/activity/ComposeActivityEmail.java
index 16373d0..4f59e2c 100644
--- a/src/com/android/email/activity/ComposeActivityEmail.java
+++ b/src/com/android/email/activity/ComposeActivityEmail.java
@@ -24,15 +24,21 @@
 
 import com.android.email.R;
 import com.android.mail.compose.ComposeActivity;
+import com.android.mail.utils.LogUtils;
 
 public class ComposeActivityEmail extends ComposeActivity
         implements InsertQuickResponseDialog.Callback {
     static final String insertQuickResponseDialogTag = "insertQuickResponseDialog";
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.email_compose_menu_extras, menu);
-        return true;
+        final boolean superCreated = super.onCreateOptionsMenu(menu);
+        if (mReplyFromAccount != null) {
+            getMenuInflater().inflate(R.menu.email_compose_menu_extras, menu);
+            return true;
+        } else {
+            LogUtils.d(LogUtils.TAG, "mReplyFromAccount is null, not adding Quick Response menu");
+            return superCreated;
+        }
     }
 
     @Override