diff options
| author | Christian S <christian@pix-art.de> | 2016-05-04 21:39:59 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-04 21:39:59 +0200 |
| commit | 7f82dca8612ded6f9091e8a122b678f21f912eaa (patch) | |
| tree | 1ba2322e9e5a2b548eb840ffe33bad80439b0230 /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | fe60bd582aee184b49d1af14357cb88ad2637c3e (diff) | |
| parent | c27663c4566762d06ff1ed1c98ed943c01a172f4 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into HEAD
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index d69fa4b95..88ce1dfd5 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -760,7 +760,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { @Override protected void onPostExecute(Bitmap bitmap) { - if (bitmap != null) { + if (bitmap != null && !isCancelled()) { final ImageView imageView = imageViewReference.get(); if (imageView != null) { imageView.setImageBitmap(bitmap); @@ -774,6 +774,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { if (cancelPotentialWork(message, imageView)) { final Bitmap bm = activity.avatarService().get(message, activity.getPixel(48), true); if (bm != null) { + cancelPotentialWork(message, imageView); imageView.setImageBitmap(bm); imageView.setBackgroundColor(0x00000000); } else { |