mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-30 21:52:28 +01:00
committed by
Nicholas Tinsley
parent
aa33fd44b8
commit
ec96b4e3aa
@@ -12,11 +12,11 @@ import android.os.Parcelable;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.target.SimpleTarget;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
|
||||
import org.signal.imageeditor.app.GlideApp;
|
||||
import org.signal.imageeditor.core.Bounds;
|
||||
import org.signal.imageeditor.core.Renderer;
|
||||
import org.signal.imageeditor.core.RendererContext;
|
||||
@@ -47,7 +47,7 @@ public final class UriRenderer implements Renderer, Parcelable {
|
||||
if (bitmap != null && bitmap.isRecycled()) bitmap = null;
|
||||
|
||||
if (bitmap == null) {
|
||||
GlideApp.with(rendererContext.context)
|
||||
Glide.with(rendererContext.context)
|
||||
.asBitmap()
|
||||
.load(imageUri)
|
||||
.diskCacheStrategy(DiskCacheStrategy.ALL)
|
||||
|
||||
@@ -11,11 +11,11 @@ import android.util.Log;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.engine.DiskCacheStrategy;
|
||||
import com.bumptech.glide.request.target.SimpleTarget;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
|
||||
import org.signal.imageeditor.app.GlideApp;
|
||||
import org.signal.imageeditor.core.Bounds;
|
||||
import org.signal.imageeditor.core.RendererContext;
|
||||
|
||||
@@ -60,7 +60,7 @@ public final class UrlRenderer extends StandardHitTestRenderer {
|
||||
if (bitmap == null) {
|
||||
if (rendererContext.isBlockingLoad()) {
|
||||
try {
|
||||
setBitmap(rendererContext, GlideApp.with(rendererContext.context)
|
||||
setBitmap(rendererContext, Glide.with(rendererContext.context)
|
||||
.asBitmap()
|
||||
.load(url)
|
||||
.diskCacheStrategy(DiskCacheStrategy.ALL)
|
||||
@@ -72,7 +72,7 @@ public final class UrlRenderer extends StandardHitTestRenderer {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
} else {
|
||||
GlideApp.with(rendererContext.context)
|
||||
Glide.with(rendererContext.context)
|
||||
.asBitmap()
|
||||
.load(url)
|
||||
.diskCacheStrategy(DiskCacheStrategy.NONE)
|
||||
|
||||
Reference in New Issue
Block a user