diff --git a/app/build.gradle b/app/build.gradle index 566df8e74..b4602f0ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation("com.vanniktech:android-image-cropper:4.3.3") annotationProcessor "com.github.bumptech.glide:compiler:4.12.0" implementation 'jp.wasabeef:glide-transformations:4.3.0' - implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.24.0' + implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.23.0' implementation 'com.google.android.exoplayer:exoplayer:2.18.1' implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'com.github.piasy:rxandroidaudio:1.7.0' diff --git a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java index f121afc18..f76897669 100644 --- a/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java +++ b/app/src/main/java/app/fedilab/android/helper/CustomEmoji.java @@ -94,28 +94,29 @@ public class CustomEmoji extends ReplacementSpan { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { View view = viewWeakReference.get(); + if (animate && resource instanceof Animatable) { - Drawable.Callback callback = resource.getCallback(); + Drawable.Callback drawableCallBack = resource.getCallback(); resource.setCallback(new Drawable.Callback() { @Override public void invalidateDrawable(@NonNull Drawable drawable) { - if (callback != null) { - callback.invalidateDrawable(drawable); + if (drawableCallBack != null) { + drawableCallBack.invalidateDrawable(drawable); } view.invalidate(); } @Override public void scheduleDrawable(@NonNull Drawable drawable, @NonNull Runnable runnable, long l) { - if (callback != null) { - callback.scheduleDrawable(drawable, runnable, l); + if (drawableCallBack != null) { + drawableCallBack.scheduleDrawable(drawable, runnable, l); } } @Override public void unscheduleDrawable(@NonNull Drawable drawable, @NonNull Runnable runnable) { - if (callback != null) { - callback.unscheduleDrawable(drawable, runnable); + if (drawableCallBack != null) { + drawableCallBack.unscheduleDrawable(drawable, runnable); } } });