TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 18:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for media thumbnails flickering on model updates.

Browse Source 
Only update ImageView contents when they have changed.

Fixes #1004
Fixes #2663
Closes #3184

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-05-18 08:38:48 -07:00
parent 636b11abea
commit 082985276f
8 changed files with 74 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/components/BubbleContainer.java
View File

@@ -131,10 +131,8 @@ public abstract class BubbleContainer extends RelativeLayout {
}
private void setMediaVisibility(@MediaState int mediaState) {
media.reset();
if (!isMediaPresent(mediaState)) {
media.hide();
}
if (!isMediaPresent(mediaState)) media.setVisibility(View.GONE);
else media.setVisibility(View.VISIBLE);
}
private void setMediaPendingMask(@TransportState int transportState) {

9
src/org/thoughtcrime/securesms/components/ForegroundImageView.java
View File

@@ -122,15 +122,6 @@ public class ForegroundImageView extends RoundedImageView {
return ActivityOptions.makeScaleUpAnimation(this, 0, 0, getWidth(), getHeight());
}
public void reset() {
setImageDrawable(null);
setVisibility(View.VISIBLE);
}
public void hide() {
setVisibility(View.GONE);
}
@Override
protected boolean verifyDrawable(Drawable who) {
return super.verifyDrawable(who) || (who == mForeground);

37
src/org/thoughtcrime/securesms/components/ThumbnailView.java
View File

@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
@@ -27,13 +28,17 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
import org.thoughtcrime.securesms.mms.ThumbnailTransform;
import org.thoughtcrime.securesms.util.FutureTaskListener;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.Util;
import ws.com.google.android.mms.pdu.PduPart;
public class ThumbnailView extends ForegroundImageView {
private ListenableFutureTask<SlideDeck> slideDeckFuture = null;
private SlideDeckListener slideDeckListener = null;
private ThumbnailClickListener thumbnailClickListener = null;
private String slideId = null;
private Slide slide = null;
private Handler handler = new Handler();
public ThumbnailView(Context context) {
@@ -53,31 +58,41 @@ public class ThumbnailView extends ForegroundImageView {
super.onDetachedFromWindow();
}
public void setImageResource(@NonNull ListenableFutureTask<SlideDeck> slideDeckFuture,
@Nullable MasterSecret masterSecret)
public void setImageResource(@Nullable MasterSecret masterSecret,
long id, long timestamp,
@NonNull ListenableFutureTask<SlideDeck> slideDeckFuture)
{
if (this.slideDeckFuture != null && this.slideDeckListener != null) {
this.slideDeckFuture.removeListener(this.slideDeckListener);
}
String slideId = id + "::" + timestamp;
if (!slideId.equals(this.slideId)) {
setImageDrawable(null);
this.slide = null;
this.slideId = slideId;
}
this.slideDeckListener = new SlideDeckListener(masterSecret);
this.slideDeckFuture = slideDeckFuture;
this.slideDeckFuture.addListener(this.slideDeckListener);
}
public void setImageResource(@NonNull Slide slide) {
setImageResource(slide, null);
}
public void setImageResource(@NonNull Slide slide, @Nullable MasterSecret masterSecret) {
if (isContextValid()) {
buildGlideRequest(slide, masterSecret).into(ThumbnailView.this);
if (!Util.equals(slide, this.slide)) buildGlideRequest(slide, masterSecret).into(this);
this.slide = slide;
setOnClickListener(new ThumbnailClickDispatcher(thumbnailClickListener, slide));
} else {
Log.w(TAG, "Not going to load resource, context is invalid");
}
}
public void setImageResource(@NonNull Slide slide) {
setImageResource(slide, null);
}
public void setThumbnailClickListener(ThumbnailClickListener listener) {
this.thumbnailClickListener = listener;
}
@@ -131,7 +146,7 @@ public class ThumbnailView extends ForegroundImageView {
}
return Glide.with(getContext()).load(new DecryptableUri(masterSecret, slide.getThumbnailUri()))
.crossFade().transform(new ThumbnailTransform(getContext()));
.transform(new ThumbnailTransform(getContext()));
}
private GenericRequestBuilder buildPlaceholderGlideRequest(Slide slide) {
@@ -163,7 +178,8 @@ public class ThumbnailView extends ForegroundImageView {
handler.post(new Runnable() {
@Override
public void run() {
hide();
Log.w(TAG, "Resolved slide was null!");
setVisibility(View.GONE);
}
});
}
@@ -175,7 +191,8 @@ public class ThumbnailView extends ForegroundImageView {
handler.post(new Runnable() {
@Override
public void run() {
hide();
Log.w(TAG, "onFailure!");
setVisibility(View.GONE);
}
});
}