empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Upgrade Glide to 4.15.1

Browse source
This commit is contained in:
Alex Hart 2023-08-14 11:10:07 -03:00 • committed by Cody Henthorne
parent df96b05863
commit 9f75c37331
3 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideComponents.java
View file

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.mms;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -10,6 +11,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.Registry; import com.bumptech.glide.Registry;
import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.load.model.GlideUrl;
import com.bumptech.glide.load.model.UnitModelLoader; import com.bumptech.glide.load.model.UnitModelLoader;
import com.bumptech.glide.load.resource.bitmap.BitmapDrawableEncoder;
import com.bumptech.glide.load.resource.bitmap.Downsampler; import com.bumptech.glide.load.resource.bitmap.Downsampler;
import com.bumptech.glide.load.resource.bitmap.StreamBitmapDecoder; import com.bumptech.glide.load.resource.bitmap.StreamBitmapDecoder;
import com.bumptech.glide.load.resource.gif.ByteBufferGifDecoder; import com.bumptech.glide.load.resource.gif.ByteBufferGifDecoder;
@ -64,12 +66,15 @@ public class SignalGlideComponents implements RegisterGlideComponents {
registry.prepend(InputStream.class, new EncryptedCacheEncoder(secret, glide.getArrayPool())); registry.prepend(InputStream.class, new EncryptedCacheEncoder(secret, glide.getArrayPool()));
registry.prepend(Bitmap.class, new EncryptedBitmapResourceEncoder(secret));
registry.prepend(File.class, Bitmap.class, new EncryptedCacheDecoder<>(secret, new StreamBitmapDecoder(new Downsampler(registry.getImageHeaderParsers(), context.getResources().getDisplayMetrics(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool()))); registry.prepend(File.class, Bitmap.class, new EncryptedCacheDecoder<>(secret, new StreamBitmapDecoder(new Downsampler(registry.getImageHeaderParsers(), context.getResources().getDisplayMetrics(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool())));
registry.prepend(GifDrawable.class, new EncryptedGifDrawableResourceEncoder(secret)); registry.prepend(GifDrawable.class, new EncryptedGifDrawableResourceEncoder(secret));
registry.prepend(File.class, GifDrawable.class, new EncryptedCacheDecoder<>(secret, new StreamGifDecoder(registry.getImageHeaderParsers(), new ByteBufferGifDecoder(context, registry.getImageHeaderParsers(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool()))); registry.prepend(File.class, GifDrawable.class, new EncryptedCacheDecoder<>(secret, new StreamGifDecoder(registry.getImageHeaderParsers(), new ByteBufferGifDecoder(context, registry.getImageHeaderParsers(), glide.getBitmapPool(), glide.getArrayPool()), glide.getArrayPool())));
EncryptedBitmapResourceEncoder encryptedBitmapResourceEncoder = new EncryptedBitmapResourceEncoder(secret);
registry.prepend(Bitmap.class, new EncryptedBitmapResourceEncoder(secret));
registry.prepend(BitmapDrawable.class, new BitmapDrawableEncoder(glide.getBitmapPool(), encryptedBitmapResourceEncoder));
ApngBufferCacheDecoder apngBufferCacheDecoder = new ApngBufferCacheDecoder(); ApngBufferCacheDecoder apngBufferCacheDecoder = new ApngBufferCacheDecoder();
ApngStreamCacheDecoder apngStreamCacheDecoder = new ApngStreamCacheDecoder(apngBufferCacheDecoder); ApngStreamCacheDecoder apngStreamCacheDecoder = new ApngStreamCacheDecoder(apngBufferCacheDecoder);

2
dependencies.gradle
View file

@ -12,7 +12,7 @@ dependencyResolutionManagement {
version('androidx-navigation', '2.6.0') version('androidx-navigation', '2.6.0')
version('androidx-window', '1.0.0') version('androidx-window', '1.0.0')
version('exoplayer', '2.19.0') version('exoplayer', '2.19.0')
version('glide', '4.13.2') version('glide', '4.15.1')
version('kotlin', '1.8.10') version('kotlin', '1.8.10')
version('libsignal-client', '0.31.0') version('libsignal-client', '0.31.0')
version('mp4parser', '1.9.39') version('mp4parser', '1.9.39')

36
gradle/verification-metadata.xml
View file

@ -2190,29 +2190,35 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="7eaf1d8f4e688fd28e58d4249523788af1391a8ecf687db98fc6e3f3f5f94912" origin="Generated by Gradle"/> <sha256 value="7eaf1d8f4e688fd28e58d4249523788af1391a8ecf687db98fc6e3f3f5f94912" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.bumptech.glide" name="annotations" version="4.13.2"> <component group="com.github.bumptech.glide" name="annotations" version="4.15.1">
<artifact name="annotations-4.13.2.jar"> <artifact name="annotations-4.15.1.jar">
<sha256 value="05514bb1624cafe33827e6f0206b3d3d859342cac94bcdb152dc18ea582833c0" origin="Generated by Gradle"/> <sha256 value="c331e74f28d573319d6863bfbef3691cd3775580ff4a33b95ed3f227cc339b0d" origin="Generated by Gradle"/>
</artifact>
<artifact name="annotations-4.15.1.module">
<sha256 value="162bc02c4673421ea0128927881c3fea7aa7a10d5738ac37d2bda91f48e8ebad" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.bumptech.glide" name="compiler" version="4.13.2"> <component group="com.github.bumptech.glide" name="compiler" version="4.15.1">
<artifact name="compiler-4.13.2.jar"> <artifact name="compiler-4.15.1.jar">
<sha256 value="6f6354d8d7746b4c565a1c37aa4991b378f944546e8bea7f4125c701b43f21d4" origin="Generated by Gradle"/> <sha256 value="aeaceb4276dd6bf512f98588a887778fcd8e13fc7d3796610108c3b4e12212f4" origin="Generated by Gradle"/>
</artifact>
<artifact name="compiler-4.15.1.module">
<sha256 value="a949cae376d169be4638e24809bee1d2f49cdb01b7e71a99d9adf6bcb1dd424b" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.bumptech.glide" name="disklrucache" version="4.13.2"> <component group="com.github.bumptech.glide" name="disklrucache" version="4.15.1">
<artifact name="disklrucache-4.13.2.jar"> <artifact name="disklrucache-4.15.1.jar">
<sha256 value="ebdfd73c09663061fe62727d3cca4c23f383e966ed064cd1ea0e085d2e1e72dc" origin="Generated by Gradle"/> <sha256 value="b5064d1be5e0651de854294bb9a5c39cb5efb82e3bb97790b56ab35997337669" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.bumptech.glide" name="gifdecoder" version="4.13.2"> <component group="com.github.bumptech.glide" name="gifdecoder" version="4.15.1">
<artifact name="gifdecoder-4.13.2.aar"> <artifact name="gifdecoder-4.15.1.aar">
<sha256 value="f1e5aa8749657fb97dedd143eb396d1716ec2913c6e8364fd3f19237da5c0937" origin="Generated by Gradle"/> <sha256 value="eff884b824ad79c6205c22edf246e831fd811ddc8ea056326f53413143f006a4" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.bumptech.glide" name="glide" version="4.13.2"> <component group="com.github.bumptech.glide" name="glide" version="4.15.1">
<artifact name="glide-4.13.2.aar"> <artifact name="glide-4.15.1.aar">
<sha256 value="bf8a3894e7ba8844d4633497da6e774322e10eb0956be5814497bdd381ed8113" origin="Generated by Gradle"/> <sha256 value="229c27f3df9afe5528c6af35ab407e27ba0c9cbcda8e222752bad02e7074d525" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="com.github.jknack" name="handlebars" version="4.0.7"> <component group="com.github.jknack" name="handlebars" version="4.0.7">