am 0a2a346c: fix internal fancy mailtos

* commit '0a2a346c8f40ad256eef840338a75a3bdfbe8251':
  fix internal fancy mailtos

2 files changed, 19 insertions, 1 deletions

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 2945f29cd..d5ad1ce56 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -428,6 +428,14 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi
         launcher.startActivity(intent);
     }
 
+    public static void composeMailto(Context launcher, Account account, Uri mailto) {
+        final Intent intent = new Intent(Intent.ACTION_VIEW, mailto, launcher,
+                ComposeActivity.class);
+        intent.putExtra(EXTRA_FROM_EMAIL_TASK, true);
+        intent.putExtra(Utils.EXTRA_ACCOUNT, account);
+        launcher.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -1160,6 +1168,11 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi
     }
 
     @VisibleForTesting
+    public String getBodyHtml() {
+        return Html.toHtml(removeComposingSpans(mBodyView.getText()));
+    }
+
+    @VisibleForTesting
     public Account getFromAccount() {
         return mReplyFromAccount != null && mReplyFromAccount.account != null ?
                 mReplyFromAccount.account : mAccount;
@@ -2725,6 +2738,11 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi
         return TextUtils.getTrimmedLength(mSubject.getText()) == 0;
     }
 
+    @VisibleForTesting
+    public String getSubject() {
+        return mSubject.getText().toString();
+    }
+
     /* package */
     static int sendOrSaveInternal(Context context, ReplyFromAccount replyFromAccount,
             Message message, final Message refMessage, Spanned body, final CharSequence quotedText,
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index eef11979b..755914db2 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -1028,7 +1028,7 @@ public class Utils {
             final Account account) {
         final String scheme = normalizeUri(uri).getScheme();
         if (TextUtils.equals(MAILTO_SCHEME, scheme)) {
-            ComposeActivity.composeToAddress(context, account, uri.getSchemeSpecificPart());
+            ComposeActivity.composeMailto(context, account, uri);
             return true;
         }
         return false;