Update Glide to use ksp, drop kapt.

Resolves #13381

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt

@@ -4,6 +4,8 @@ import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.res.use
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
@@ -11,8 +13,6 @@ import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImageSize
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.glide.GiftBadgeModel
-import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.ScreenDensity
 import org.thoughtcrime.securesms.util.ThemeUtil
@@ -43,35 +43,35 @@ class BadgeImageView @JvmOverloads constructor(
   }
 
   fun setBadgeFromRecipient(recipient: Recipient?) {
-    getGlideRequests()?.let {
+    getGlideRequestManager()?.let {
       setBadgeFromRecipient(recipient, it)
     } ?: clearDrawable()
   }
 
-  fun setBadgeFromRecipient(recipient: Recipient?, glideRequests: GlideRequests) {
+  fun setBadgeFromRecipient(recipient: Recipient?, requestManager: RequestManager) {
     if (recipient == null || recipient.badges.isEmpty()) {
-      setBadge(null, glideRequests)
+      setBadge(null, requestManager)
     } else if (recipient.isSelf) {
       val badge = recipient.featuredBadge
       if (badge == null || !badge.visible || badge.isExpired()) {
-        setBadge(null, glideRequests)
+        setBadge(null, requestManager)
       } else {
-        setBadge(badge, glideRequests)
+        setBadge(badge, requestManager)
       }
     } else {
-      setBadge(recipient.featuredBadge, glideRequests)
+      setBadge(recipient.featuredBadge, requestManager)
     }
   }
 
   fun setBadge(badge: Badge?) {
-    getGlideRequests()?.let {
+    getGlideRequestManager()?.let {
       setBadge(badge, it)
     } ?: clearDrawable()
   }
 
-  fun setBadge(badge: Badge?, glideRequests: GlideRequests) {
+  fun setBadge(badge: Badge?, requestManager: RequestManager) {
     if (badge != null) {
-      glideRequests
+      requestManager
         .load(badge)
         .downsample(DownsampleStrategy.NONE)
         .transform(BadgeSpriteTransformation(BadgeSpriteTransformation.Size.fromInteger(badgeSize), badge.imageDensity, ThemeUtil.isDarkTheme(context)))
@@ -79,21 +79,21 @@ class BadgeImageView @JvmOverloads constructor(
 
       isClickable = true
     } else {
-      glideRequests
+      requestManager
         .clear(this)
       clearDrawable()
     }
   }
 
-  fun setGiftBadge(badge: GiftBadge?, glideRequests: GlideRequests) {
+  fun setGiftBadge(badge: GiftBadge?, requestManager: RequestManager) {
     if (badge != null) {
-      glideRequests
+      requestManager
         .load(GiftBadgeModel(badge))
         .downsample(DownsampleStrategy.NONE)
         .transform(BadgeSpriteTransformation(BadgeSpriteTransformation.Size.fromInteger(badgeSize), ScreenDensity.getBestDensityBucketForDevice(), ThemeUtil.isDarkTheme(context)))
         .into(this)
     } else {
-      glideRequests
+      requestManager
         .clear(this)
       clearDrawable()
     }
@@ -106,9 +106,9 @@ class BadgeImageView @JvmOverloads constructor(
     }
   }
 
-  private fun getGlideRequests(): GlideRequests? {
+  private fun getGlideRequestManager(): RequestManager? {
     return try {
-      GlideApp.with(this)
+      Glide.with(this)
     } catch (e: IllegalArgumentException) {
       // View not attached to an activity or activity destroyed
       null

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/GiftMessageView.kt

@@ -9,13 +9,13 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
+import com.bumptech.glide.RequestManager
 import com.google.android.material.button.MaterialButton
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.badges.gifts.Gifts.formatExpiry
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
@@ -50,7 +50,7 @@ class GiftMessageView @JvmOverloads constructor(
     }
   }
 
-  fun setGiftBadge(glideRequests: GlideRequests, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback, fromRecipient: Recipient, toRecipient: Recipient) {
+  fun setGiftBadge(requestManager: RequestManager, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback, fromRecipient: Recipient, toRecipient: Recipient) {
     descriptionView.text = giftBadge.formatExpiry(context)
     actionView.icon = null
     actionView.setOnClickListener { callback.onViewGiftBadgeClicked() }
@@ -88,7 +88,7 @@ class GiftMessageView @JvmOverloads constructor(
       )
     }
 
-    badgeView.setGiftBadge(giftBadge, glideRequests)
+    badgeView.setGiftBadge(giftBadge, requestManager)
   }
 
   fun onGiftNotOpened() {

app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.compose.runtime.Stable
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.Key
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
@@ -14,7 +15,6 @@ import kotlinx.parcelize.Parcelize
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.util.ThemeUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -130,7 +130,7 @@ data class Badge(
 
       badge.alpha = if (model.badge.isExpired() || model.isFaded) 0.5f else 1f
 
-      GlideApp.with(badge)
+      Glide.with(badge)
         .load(model.badge)
         .downsample(DownsampleStrategy.NONE)
         .diskCacheStrategy(DiskCacheStrategy.NONE)

app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgeDisplay112.kt

@@ -2,10 +2,10 @@ package org.thoughtcrime.securesms.badges.models
 
 import android.view.View
 import android.widget.TextView
+import com.bumptech.glide.Glide
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
@@ -49,7 +49,7 @@ object BadgeDisplay112 {
 
     override fun bind(model: GiftModel) {
       titleView.visible = false
-      badgeImageView.setGiftBadge(model.giftBadge, GlideApp.with(badgeImageView))
+      badgeImageView.setGiftBadge(model.giftBadge, Glide.with(badgeImageView))
     }
   }
 }