Preserve advertiser name
We were previously parsing the name as an email address, which
caused problems with certain non-alphanumeric characters.
Bug: 10605932
Change-Id: I1ea17096950f50b68e44cc1c976b69c4060b46e4
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 46bf234..26c2241 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -822,7 +822,11 @@
mHeader.hasDraftMessage = mHeader.conversation.numDrafts() > 0;
// Parse senders fragments.
- if (mHeader.conversation.conversationInfo != null) {
+ if (mHeader.preserveSendersText) {
+ // This is a special view that doesn't need special sender formatting
+ mHeader.sendersDisplayText = new SpannableStringBuilder(mHeader.sendersText);
+ loadSenderImages();
+ } else if (mHeader.conversation.conversationInfo != null) {
// This is Gmail
Context context = getContext();
mHeader.messageInfoString = SendersView
diff --git a/src/com/android/mail/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
index ea191a0..359f8f3 100644
--- a/src/com/android/mail/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java
@@ -78,6 +78,9 @@
// Paperclip
Bitmap paperclip;
+ /** If <code>true</code>, we will not apply any formatting to {@link #sendersText}. */
+ public boolean preserveSendersText = false;
+
// Senders
public String sendersText;