From 14fd30499baaf37dc534cb330ac93275db8b1e83 Mon Sep 17 00:00:00 2001 From: Greg Bullock Date: Tue, 12 Aug 2014 09:21:15 +0200 Subject: Extract protected method to determine From field. Change-Id: Icf8902d38139ab3725226d1fe05f0122a285fec1 Bug: 16968834 --- src/com/android/mail/compose/ComposeActivity.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java index e47d21042..5779a79d3 100644 --- a/src/com/android/mail/compose/ComposeActivity.java +++ b/src/com/android/mail/compose/ComposeActivity.java @@ -1109,14 +1109,18 @@ public class ComposeActivity extends ActionBarActivity } } message.accountUri = null; + message.setFrom(computeFromForAccount(selectedReplyFromAccount)); + message.draftType = getDraftType(mode); + return message; + } + + protected String computeFromForAccount(ReplyFromAccount selectedReplyFromAccount) { final String email = selectedReplyFromAccount != null ? selectedReplyFromAccount.address : mAccount != null ? mAccount.getEmailAddress() : null; final String senderName = selectedReplyFromAccount != null ? selectedReplyFromAccount.name : mAccount != null ? mAccount.getSenderName() : null; final Address address = new Address(email, senderName); - message.setFrom(address.toHeader()); - message.draftType = getDraftType(mode); - return message; + return address.toHeader(); } private static String formatSenders(final String string) { -- cgit v1.2.3