Add signature support to reply and forwards

1 files changed, 14 insertions, 8 deletions

diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 8ec0f481e..002bcaab9 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -310,6 +310,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             mDraftNeedsSaving = true;
             mMessageLoaded = true;
             mSourceMessageProcessed = true;
+            addSignature();
         } else {
             // Otherwise, handle the internal cases (Message Composer invoked from within app)
             long messageId = draftId != -1 ? draftId : intent.getLongExtra(EXTRA_MESSAGE_ID, -1);
@@ -321,13 +322,8 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
                 // But we DO need to set mMessageLoaded to indicate the message can be sent
                 mMessageLoaded = true;
                 mSourceMessageProcessed = true;
-                
-                // Add the signature to the new message
-                final String sig = mAccount.getSignature();
-                if (sig != null && sig.length() > 0) {
-                	mMessageContentView.setText("\n\n" + sig);
-                }
-            }
+                addSignature();
+            }            
         }
 
         if (ACTION_REPLY.equals(mAction) || ACTION_REPLY_ALL.equals(mAction) ||
@@ -340,6 +336,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
              */
             // TODO: signal the controller to load the message
         }
+        
         updateTitle();
     }
 
@@ -573,7 +570,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
                     message.mHtmlReply = null;
                     message.mTextReply = null;
                     message.mIntroText = null;
-                }
+                }                
             } catch (RuntimeException e) {
                 Log.d(Email.LOG_TAG, "Exception while loading message body: " + e);
                 return new Object[] {null, null};
@@ -628,6 +625,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             mAccount = account;
             processSourceMessageGuarded(message, mAccount);
             mMessageLoaded = true;
+            addSignature();
         }
     }
 
@@ -639,6 +637,14 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         }
     }
 
+    private void addSignature() {
+        final String sig = mAccount.getSignature();
+        // if there is a signature and the message is empty, add it
+        if (sig != null && sig.length() > 0 && mMessageContentView.getText().length() == 0) {
+        	mMessageContentView.setText("\n\n" + sig);
+        }
+    }
+
     public void onFocusChange(View view, boolean focused) {
         if (!focused) {
             updateTitle();