mirror of
https://github.com/oxen-io/session-android.git
synced 2025-01-11 18:53:40 +00:00
fix bug where sdk < kitkat is unjustly punished
This commit is contained in:
parent
e80de7de2b
commit
aab34e491e
@ -186,24 +186,25 @@ public class ConversationItem extends LinearLayout {
|
|||||||
|
|
||||||
private void setBodyText(MessageRecord messageRecord) {
|
private void setBodyText(MessageRecord messageRecord) {
|
||||||
|
|
||||||
|
if (messageRecord.isPush() && messageRecord.isOutgoing()) {
|
||||||
|
LinearLayout conversationParent = (LinearLayout)findViewById(R.id.conversation_item_parent);
|
||||||
|
if (conversationParent != null) {
|
||||||
|
int attributes[] = new int[]{R.attr.conversation_item_sent_push_background,
|
||||||
|
R.attr.conversation_item_sent_push_triangle_background};
|
||||||
|
TypedArray drawables = context.obtainStyledAttributes(attributes);
|
||||||
|
|
||||||
|
if (drawables != null) {
|
||||||
|
setViewBackgroundWithoutResettingPadding(conversationParent, drawables.getResourceId(0, -1));
|
||||||
|
setViewBackgroundWithoutResettingPadding(findViewById(R.id.triangle_tick), drawables.getResourceId(1, -1));
|
||||||
|
drawables.recycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
|
||||||
bodyText.setText(Emoji.getInstance(context).emojify(messageRecord.getDisplayBody(), Emoji.EMOJI_LARGE),
|
bodyText.setText(Emoji.getInstance(context).emojify(messageRecord.getDisplayBody(), Emoji.EMOJI_LARGE),
|
||||||
TextView.BufferType.SPANNABLE);
|
TextView.BufferType.SPANNABLE);
|
||||||
} else {
|
} else {
|
||||||
if (messageRecord.isPush() && messageRecord.isOutgoing()) {
|
|
||||||
LinearLayout conversationParent = (LinearLayout)findViewById(R.id.conversation_item_parent);
|
|
||||||
if (conversationParent != null) {
|
|
||||||
int attributes[] = new int[]{R.attr.conversation_item_sent_push_background,
|
|
||||||
R.attr.conversation_item_sent_push_triangle_background};
|
|
||||||
TypedArray drawables = context.obtainStyledAttributes(attributes);
|
|
||||||
|
|
||||||
if (drawables != null) {
|
|
||||||
setViewBackgroundWithoutResettingPadding(conversationParent, drawables.getResourceId(0, -1));
|
|
||||||
setViewBackgroundWithoutResettingPadding(findViewById(R.id.triangle_tick), drawables.getResourceId(1, -1));
|
|
||||||
drawables.recycle();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
bodyText.setText(messageRecord.getDisplayBody());
|
bodyText.setText(messageRecord.getDisplayBody());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user