fix bug where sdk < kitkat is unjustly punished

This commit is contained in:
Jake McGinty 2014-02-23 16:03:42 -08:00
parent e80de7de2b
commit aab34e491e

View File

@ -186,10 +186,6 @@ public class ConversationItem extends LinearLayout {
private void setBodyText(MessageRecord messageRecord) { private void setBodyText(MessageRecord messageRecord) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
bodyText.setText(Emoji.getInstance(context).emojify(messageRecord.getDisplayBody(), Emoji.EMOJI_LARGE),
TextView.BufferType.SPANNABLE);
} else {
if (messageRecord.isPush() && messageRecord.isOutgoing()) { if (messageRecord.isPush() && messageRecord.isOutgoing()) {
LinearLayout conversationParent = (LinearLayout)findViewById(R.id.conversation_item_parent); LinearLayout conversationParent = (LinearLayout)findViewById(R.id.conversation_item_parent);
if (conversationParent != null) { if (conversationParent != null) {
@ -204,6 +200,11 @@ public class ConversationItem extends LinearLayout {
} }
} }
} }
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
bodyText.setText(Emoji.getInstance(context).emojify(messageRecord.getDisplayBody(), Emoji.EMOJI_LARGE),
TextView.BufferType.SPANNABLE);
} else {
bodyText.setText(messageRecord.getDisplayBody()); bodyText.setText(messageRecord.getDisplayBody());
} }
} }