summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-10-14 12:07:29 -0700
committerJin Cao <jinyan@google.com>2014-10-14 12:09:59 -0700
commit0d9a37e03c2b4cb0329863a97e4ce52c1a2c5a44 (patch)
tree7a19def1673aba31860ecab1233538bb26cae3ee /src
parent8d5f3c383c7440c2184163f66b0b4f7ddaf70a03 (diff)
downloadandroid_packages_apps_UnifiedEmail-0d9a37e03c2b4cb0329863a97e4ce52c1a2c5a44.tar.gz
android_packages_apps_UnifiedEmail-0d9a37e03c2b4cb0329863a97e4ce52c1a2c5a44.tar.bz2
android_packages_apps_UnifiedEmail-0d9a37e03c2b4cb0329863a97e4ce52c1a2c5a44.zip
Fix html conversion failure check to use trim
b/16489004 Change-Id: I6b4b998cae27fa8f0c20a3eff028b64977c15780
Diffstat (limited to 'src')
-rw-r--r--src/com/android/mail/compose/ComposeActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 84de483a9..b7bab7546 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -1139,7 +1139,8 @@ public class ComposeActivity extends ActionBarActivity
message.bodyText = body.toString();
// Fallback to use the text version if html conversion fails for whatever the reason.
final String htmlInPlainText = Utils.convertHtmlToPlainText(message.bodyHtml);
- if (!TextUtils.isEmpty(message.bodyText) && TextUtils.isEmpty(htmlInPlainText)) {
+ if (message.bodyText != null && message.bodyText.trim().length() > 0 &&
+ TextUtils.isEmpty(htmlInPlainText)) {
LogUtils.w(LOG_TAG, "FAILED HTML CONVERSION: from %d to %d", message.bodyText.length(),
htmlInPlainText.length());
Analytics.getInstance().sendEvent("errors", "failed_html_conversion", null, 0);