From 9340e7a6f4401789602cca1997e6da3e1044728e Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Mon, 27 Feb 2023 08:54:26 +0100
Subject: [PATCH] update Glide to 4.15.0 (#3384)

---
 .../keylesspalace/tusky/adapter/NotificationsAdapter.java    | 2 +-
 .../keylesspalace/tusky/adapter/StatusBaseViewHolder.java    | 5 ++---
 gradle/libs.versions.toml                                    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
index 8f45c0af..87096232 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
@@ -599,7 +599,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
             if (statusDisplayOptions.showBotOverlay() && isBot) {
                 notificationAvatar.setVisibility(View.VISIBLE);
                 Glide.with(notificationAvatar)
-                        .load(ContextCompat.getDrawable(notificationAvatar.getContext(), R.drawable.bot_badge))
+                        .load(R.drawable.bot_badge)
                         .into(notificationAvatar);
 
             } else {
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index f061523f..f38a5d68 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -283,8 +283,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             if (statusDisplayOptions.showBotOverlay() && isBot) {
                 avatarInset.setVisibility(View.VISIBLE);
                 Glide.with(avatarInset)
-                        // passing the drawable id directly into .load() ignores night mode https://github.com/bumptech/glide/issues/4692
-                        .load(ContextCompat.getDrawable(avatarInset.getContext(), R.drawable.bot_badge))
+                        .load(R.drawable.bot_badge)
                         .into(avatarInset);
             } else {
                 avatarInset.setVisibility(View.GONE);
@@ -1115,7 +1114,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                 cardImage.setScaleType(ImageView.ScaleType.CENTER);
 
                 Glide.with(cardImage.getContext())
-                        .load(ContextCompat.getDrawable(cardImage.getContext(), R.drawable.card_image_placeholder))
+                        .load(R.drawable.card_image_placeholder)
                         .into(cardImage);
             }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 89cd95bd..5f460055 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ dagger = "2.45"
 emoji2 = "1.2.0"
 espresso = "3.5.1"
 filemoji-compat = "3.2.7"
-glide = "4.13.2"
+glide = "4.15.0"
 glide-animation-plugin = "2.24.0"
 gson = "2.10.1"
 kotlin = "1.8.10"