TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-25 12:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with recycled ListItems.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-02-23 17:11:10 -08:00
parent aab34e491e
commit da344a0218
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@ -75,14 +75,20 @@ import java.io.OutputStream;
public class ConversationItem extends LinearLayout { public class ConversationItem extends LinearLayout {
private final static String TAG = ConversationItem.class.getSimpleName(); private final static String TAG = ConversationItem.class.getSimpleName();
private final int STYLE_ATTRIBUTES[] = new int[]{R.attr.conversation_item_sent_push_background,
R.attr.conversation_item_sent_push_triangle_background,
R.attr.conversation_item_sent_background,
R.attr.conversation_item_sent_triangle_background};
private Handler failedIconHandler; private Handler failedIconHandler;
private MessageRecord messageRecord; private MessageRecord messageRecord;
private MasterSecret masterSecret; private MasterSecret masterSecret;
private boolean groupThread; private boolean groupThread;
private TextView bodyText; private View conversationParent;
private TextView dateText; private TextView bodyText;
private TextView groupStatusText; private TextView dateText;
private TextView groupStatusText;
private ImageView secureImage; private ImageView secureImage;
private ImageView failedImage; private ImageView failedImage;
private ImageView keyImage; private ImageView keyImage;
@ -94,6 +100,7 @@ public class ConversationItem extends LinearLayout {
private Button mmsDownloadButton; private Button mmsDownloadButton;
private TextView mmsDownloadingLabel; private TextView mmsDownloadingLabel;
private ListenableFutureTask<SlideDeck> slideDeck; private ListenableFutureTask<SlideDeck> slideDeck;
private TypedArray backgroundDrawables;
private final FailedIconClickListener failedIconClickListener = new FailedIconClickListener(); private final FailedIconClickListener failedIconClickListener = new FailedIconClickListener();
private final MmsDownloadClickListener mmsDownloadClickListener = new MmsDownloadClickListener(); private final MmsDownloadClickListener mmsDownloadClickListener = new MmsDownloadClickListener();
@ -128,6 +135,8 @@ public class ConversationItem extends LinearLayout {
this.mmsDownloadingLabel = (TextView) findViewById(R.id.mms_label_downloading); this.mmsDownloadingLabel = (TextView) findViewById(R.id.mms_label_downloading);
this.contactPhoto = (ImageView)findViewById(R.id.contact_photo); this.contactPhoto = (ImageView)findViewById(R.id.contact_photo);
this.deliveredImage = (ImageView)findViewById(R.id.delivered_indicator); this.deliveredImage = (ImageView)findViewById(R.id.delivered_indicator);
this.conversationParent = (View) findViewById(R.id.conversation_item_parent);
this.backgroundDrawables = context.obtainStyledAttributes(STYLE_ATTRIBUTES);
setOnClickListener(clickListener); setOnClickListener(clickListener);
if (failedImage != null) failedImage.setOnClickListener(failedIconClickListener); if (failedImage != null) failedImage.setOnClickListener(failedIconClickListener);
@ -186,18 +195,13 @@ public class ConversationItem extends LinearLayout {
private void setBodyText(MessageRecord messageRecord) { private void setBodyText(MessageRecord messageRecord) {
if (messageRecord.isPush() && messageRecord.isOutgoing()) { if (conversationParent != null && backgroundDrawables != null) {
LinearLayout conversationParent = (LinearLayout)findViewById(R.id.conversation_item_parent); if (messageRecord.isPush() && messageRecord.isOutgoing()) {
if (conversationParent != null) { setViewBackgroundWithoutResettingPadding(conversationParent, backgroundDrawables.getResourceId(0, -1));
int attributes[] = new int[]{R.attr.conversation_item_sent_push_background, setViewBackgroundWithoutResettingPadding(findViewById(R.id.triangle_tick), backgroundDrawables.getResourceId(1, -1));
R.attr.conversation_item_sent_push_triangle_background}; } else if (messageRecord.isOutgoing()) {
TypedArray drawables = context.obtainStyledAttributes(attributes); setViewBackgroundWithoutResettingPadding(conversationParent, backgroundDrawables.getResourceId(2, -1));
setViewBackgroundWithoutResettingPadding(findViewById(R.id.triangle_tick), backgroundDrawables.getResourceId(3, -1));
if (drawables != null) {
setViewBackgroundWithoutResettingPadding(conversationParent, drawables.getResourceId(0, -1));
setViewBackgroundWithoutResettingPadding(findViewById(R.id.triangle_tick), drawables.getResourceId(1, -1));
drawables.recycle();
}
} }
} }