Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00: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

6
image-editor/app/build.gradle
View File

@@ -1,6 +1,6 @@
plugins {
id("signal-sample-app")
id("kotlin-kapt")
id("com.google.devtools.ksp")
}
android {
@@ -15,5 +15,5 @@ dependencies {
implementation(project(":image-editor"))
implementation(libs.glide.glide)
kapt(libs.glide.compiler)
}
ksp(libs.glide.ksp)
}

4
image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/UriRenderer.java
View File

@@ -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)

6
image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/UrlRenderer.java
View File

@@ -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)