Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 18:00:02 +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

34
app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
View File

@@ -14,6 +14,9 @@ import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.IconCompat;
import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestBuilder;
import com.bumptech.glide.RequestManager;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
@@ -28,9 +31,6 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.GlideRequest;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.providers.AvatarProvider;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -65,7 +65,7 @@ public final class AvatarUtil {
photo = recipient.getContactPhoto();
}
GlideApp.with(target)
Glide.with(target)
.load(photo)
.transform(new BlurTransformation(context, 0.25f, BlurTransformation.MAX_RADIUS), new CenterCrop())
.into(new CustomViewTarget<View, Drawable>(target) {
@@ -94,7 +94,7 @@ public final class AvatarUtil {
public static void loadIconIntoImageView(@NonNull Recipient recipient, @NonNull ImageView target, int requestedSize) {
Context context = target.getContext();
requestCircle(GlideApp.with(context).asDrawable(), context, recipient, requestedSize).into(target);
requestCircle(Glide.with(context).asDrawable(), context, recipient, requestedSize).into(target);
}
public static Bitmap loadIconBitmapSquareNoCache(@NonNull Context context,
@@ -103,7 +103,7 @@ public final class AvatarUtil {
int height)
throws ExecutionException, InterruptedException
{
return requestSquare(GlideApp.with(context).asBitmap(), context, recipient)
return requestSquare(Glide.with(context).asBitmap(), context, recipient)
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.NONE)
.submit(width, height)
@@ -129,10 +129,10 @@ public final class AvatarUtil {
ThreadUtil.assertNotMainThread();
try {
AvatarTarget avatarTarget = new AvatarTarget(size);
GlideRequests glideRequests = GlideApp.with(context);
AvatarTarget avatarTarget = new AvatarTarget(size);
RequestManager requestManager = Glide.with(context);
requestCircle(glideRequests.asBitmap(), context, recipient, size).into(avatarTarget);
requestCircle(requestManager.asBitmap(), context, recipient, size).into(avatarTarget);
Bitmap bitmap = avatarTarget.await();
return Objects.requireNonNullElseGet(bitmap, () -> DrawableUtil.toBitmap(getFallback(context, recipient, size), size, size));
@@ -141,19 +141,19 @@ public final class AvatarUtil {
}
}
private static <T> GlideRequest<T> requestCircle(@NonNull GlideRequest<T> glideRequest, @NonNull Context context, @NonNull Recipient recipient, int targetSize) {
return request(glideRequest, context, recipient, targetSize, new CircleCrop());
private static <T> RequestBuilder<T> requestCircle(@NonNull RequestBuilder<T> requestBuilder, @NonNull Context context, @NonNull Recipient recipient, int targetSize) {
return request(requestBuilder, context, recipient, targetSize, new CircleCrop());
}
private static <T> GlideRequest<T> requestSquare(@NonNull GlideRequest<T> glideRequest, @NonNull Context context, @NonNull Recipient recipient) {
return request(glideRequest, context, recipient, UNDEFINED_SIZE, new CenterCrop());
private static <T> RequestBuilder<T> requestSquare(@NonNull RequestBuilder<T> requestBuilder, @NonNull Context context, @NonNull Recipient recipient) {
return request(requestBuilder, context, recipient, UNDEFINED_SIZE, new CenterCrop());
}
private static <T> GlideRequest<T> request(@NonNull GlideRequest<T> glideRequest, @NonNull Context context, @NonNull Recipient recipient, int targetSize, @Nullable BitmapTransformation transformation) {
return request(glideRequest, context, recipient, true, targetSize, transformation);
private static <T> RequestBuilder<T> request(@NonNull RequestBuilder<T> requestBuilder, @NonNull Context context, @NonNull Recipient recipient, int targetSize, @Nullable BitmapTransformation transformation) {
return request(requestBuilder, context, recipient, true, targetSize, transformation);
}
private static <T> GlideRequest<T> request(@NonNull GlideRequest<T> glideRequest, @NonNull Context context, @NonNull Recipient recipient, boolean loadSelf, int targetSize, @Nullable BitmapTransformation transformation) {
private static <T> RequestBuilder<T> request(@NonNull RequestBuilder<T> requestBuilder, @NonNull Context context, @NonNull Recipient recipient, boolean loadSelf, int targetSize, @Nullable BitmapTransformation transformation) {
final ContactPhoto photo;
if (Recipient.self().equals(recipient) && loadSelf) {
@@ -163,7 +163,7 @@ public final class AvatarUtil {
}
final int size = targetSize == -1 ? DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE : targetSize;
final GlideRequest<T> request = glideRequest.load(photo)
final RequestBuilder<T> request = requestBuilder.load(photo)
.error(getFallback(context, recipient, size))
.diskCacheStrategy(DiskCacheStrategy.ALL)
.override(size);

6
app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java
View File

@@ -18,11 +18,11 @@ import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import androidx.exifinterface.media.ExifInterface;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.MediaConstraints;
import java.io.BufferedInputStream;
@@ -113,7 +113,7 @@ public class BitmapUtil {
int attempts = 0;
byte[] bytes;
Bitmap scaledBitmap = GlideApp.with(context.getApplicationContext())
Bitmap scaledBitmap = Glide.with(context.getApplicationContext())
.asBitmap()
.load(model)
.skipMemoryCache(true)
@@ -179,7 +179,7 @@ public class BitmapUtil {
throws BitmapDecodingException
{
try {
return GlideApp.with(context.getApplicationContext())
return Glide.with(context.getApplicationContext())
.asBitmap()
.load(model)
.centerInside()

4
app/src/main/java/org/thoughtcrime/securesms/util/ImageCompressionUtil.java
View File

@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.engine.GlideException;
@@ -16,7 +17,6 @@ import com.bumptech.glide.request.target.Target;
import org.signal.core.util.ByteSize;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.mms.GlideApp;
import java.io.ByteArrayOutputStream;
import java.util.List;
@@ -82,7 +82,7 @@ public final class ImageCompressionUtil {
Bitmap scaledBitmap;
try {
scaledBitmap = GlideApp.with(context.getApplicationContext())
scaledBitmap = Glide.with(context.getApplicationContext())
.asBitmap()
.addListener(bitmapRequestListener)
.load(glideModel)

4
app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
View File

@@ -24,6 +24,7 @@ import androidx.annotation.RequiresApi;
import androidx.annotation.WorkerThread;
import androidx.exifinterface.media.ExifInterface;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.gif.GifDrawable;
@@ -36,7 +37,6 @@ import org.thoughtcrime.securesms.mms.AudioSlide;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
import org.thoughtcrime.securesms.mms.DocumentSlide;
import org.thoughtcrime.securesms.mms.GifSlide;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.ImageSlide;
import org.thoughtcrime.securesms.mms.MmsSlide;
import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -202,7 +202,7 @@ public class MediaUtil {
if (MediaUtil.isGif(contentType)) {
try {
GifDrawable drawable = GlideApp.with(context)
GifDrawable drawable = Glide.with(context)
.asGif()
.skipMemoryCache(true)
.diskCacheStrategy(DiskCacheStrategy.NONE)