commit 41c3a25165145c501cda67c156720c2f50b63685
author Tony Mantler <nicoya@google.com> Mon Jun 30 11:00:43 2014 -0700
committer Tony Mantler <nicoya@google.com> Mon Jun 30 11:00:43 2014 -0700
tree f18dff1786b0713072bd915532294efafdf40dc8
parent eb58a092961773a8da67c0e0dd5770346381d938

Don't try to format null in reply subjects

Tested on Email and Gmail

b/11810597

Change-Id: I76887a32add769a609fa90a17daf469a47b0c760

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 1cb455f..e956a1b 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -2155,8 +2155,8 @@
      * E.g., "FWD: " is prepended if action is {@link ComposeActivity#FORWARD}.
      */
     public static String buildFormattedSubject(Resources res, String subject, int action) {
-        String prefix;
-        String correctedSubject = null;
+        final String prefix;
+        final String correctedSubject;
         if (action == ComposeActivity.COMPOSE) {
             prefix = "";
         } else if (action == ComposeActivity.FORWARD) {
@@ -2165,13 +2165,16 @@
             prefix = res.getString(R.string.reply_subject_label);
         }
 
-        // Don't duplicate the prefix
-        if (!TextUtils.isEmpty(subject)
-                && subject.toLowerCase().startsWith(prefix.toLowerCase())) {
-            correctedSubject = subject;
+        if (TextUtils.isEmpty(subject)) {
+            correctedSubject = prefix;
         } else {
-            correctedSubject = String.format(
-                    res.getString(R.string.formatted_subject), prefix, subject);
+            // Don't duplicate the prefix
+            if (subject.toLowerCase().startsWith(prefix.toLowerCase())) {
+                correctedSubject = subject;
+            } else {
+                correctedSubject = String.format(
+                        res.getString(R.string.formatted_subject), prefix, subject);
+            }
         }
 
         return correctedSubject;