Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Glide to use ksp, drop kapt.

Browse Source 
Resolves #13381
This commit is contained in:
Jameson Williams
2024-01-24 02:54:09 -06:00
committed by Nicholas Tinsley
parent aa33fd44b8
commit ec96b4e3aa
132 changed files with 755 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
View File

@@ -19,6 +19,8 @@ import android.renderscript.ScriptIntrinsicBlur;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestBuilder;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
@@ -31,8 +33,6 @@ import org.signal.imageeditor.core.SelectableRenderer;
import org.signal.imageeditor.core.model.EditorElement;
import org.signal.imageeditor.core.model.EditorModel;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.GlideRequest;
import org.thoughtcrime.securesms.util.BitmapUtil;
import java.util.concurrent.ExecutionException;
@@ -94,13 +94,13 @@ public final class UriGlideRenderer implements SelectableRenderer {
if (getBitmap() == null) {
if (rendererContext.isBlockingLoad()) {
try {
Bitmap bitmap = getBitmapGlideRequest(rendererContext.context, false).submit().get();
Bitmap bitmap = getGlideRequestBuilder(rendererContext.context, false).submit().get();
setBitmap(rendererContext, bitmap);
} catch (ExecutionException | InterruptedException e) {
throw new RuntimeException(e);
}
} else {
getBitmapGlideRequest(rendererContext.context, true).into(new CustomTarget<Bitmap>() {
getGlideRequestBuilder(rendererContext.context, true).into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
setBitmap(rendererContext, resource);
@@ -181,7 +181,7 @@ public final class UriGlideRenderer implements SelectableRenderer {
}
}
private GlideRequest<Bitmap> getBitmapGlideRequest(@NonNull Context context, boolean preview) {
private RequestBuilder<Bitmap> getGlideRequestBuilder(@NonNull Context context, boolean preview) {
int width = this.maxWidth;
int height = this.maxHeight;
@@ -190,7 +190,7 @@ public final class UriGlideRenderer implements SelectableRenderer {
height = Math.min(height, PREVIEW_DIMENSION_LIMIT);
}
return GlideApp.with(context)
return Glide.with(context)
.asBitmap()
.override(width, height)
.centerInside()