From 1793c77bf2f46a6ce529a7046e41f3c30cf5f26d Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 7 Mar 2025 10:17:28 -0500
Subject: [PATCH] Revert "Fix some media not appearing in the gallery picker."

This reverts commit 5ad042d2328587cc59ae69d9ad68a820c7b43d17.
---
 .../securesms/components/ThumbnailView.java      |  8 +-------
 .../v2/gallery/MediaGallerySelectableItem.kt     | 16 ++--------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
index 0e3624e1c8..54870bf298 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -45,7 +45,6 @@ import org.thoughtcrime.securesms.components.transfercontrols.TransferControlVie
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.ImageSlide;
-import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
@@ -484,12 +483,7 @@ public class ThumbnailView extends FrameLayout {
 
     transferControlViewStub.setVisibility(View.GONE);
 
-    Object glideModel = uri;
-    if (PartAuthority.isLocalUri(uri)) {
-      glideModel = new DecryptableUri(uri);
-    }
-
-    RequestBuilder<Drawable> request = requestManager.load(glideModel)
+    RequestBuilder<Drawable> request = requestManager.load(new DecryptableUri(uri))
                                                   .diskCacheStrategy(DiskCacheStrategy.NONE)
                                                   .downsample(SignalDownsampleStrategy.CENTER_OUTSIDE_NO_UPSCALE)
                                                   .listener(listener);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGallerySelectableItem.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGallerySelectableItem.kt
index 14567500cd..46b717207d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGallerySelectableItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGallerySelectableItem.kt
@@ -2,14 +2,12 @@ package org.thoughtcrime.securesms.mediasend.v2.gallery
 
 import android.animation.ValueAnimator
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.setPadding
 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
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
@@ -20,7 +18,6 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mediasend.MediaFolder
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
-import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -69,14 +66,6 @@ object MediaGallerySelectableItem {
     }
   }
 
-  private fun Uri.toGlideModel(): Any {
-    return if (PartAuthority.isLocalUri(this)) {
-      DecryptableStreamUriLoader.DecryptableUri(this)
-    } else {
-      this
-    }
-  }
-
   abstract class BaseViewHolder<T : MappingModel<T>>(itemView: View) : MappingViewHolder<T>(itemView) {
     protected val imageView: ShapeableImageView = itemView.findViewById(R.id.media_gallery_image)
     protected val playOverlay: ImageView? = itemView.findViewById(R.id.media_gallery_play_overlay)
@@ -87,7 +76,7 @@ object MediaGallerySelectableItem {
   class FolderViewHolder(itemView: View, private val onMediaFolderClicked: OnMediaFolderClicked) : BaseViewHolder<FolderModel>(itemView) {
     override fun bind(model: FolderModel) {
       Glide.with(imageView)
-        .load(model.mediaFolder.thumbnailUri.toGlideModel())
+        .load(DecryptableStreamUriLoader.DecryptableUri(model.mediaFolder.thumbnailUri))
         .into(imageView)
 
       playOverlay?.visible = false
@@ -142,8 +131,7 @@ object MediaGallerySelectableItem {
       }
 
       Glide.with(imageView)
-        .load(model.media.uri.toGlideModel())
-        .diskCacheStrategy(DiskCacheStrategy.ALL)
+        .load(DecryptableStreamUriLoader.DecryptableUri(model.media.uri))
         .addListener(ErrorLoggingRequestListener(FILE_VIEW_HOLDER_TAG))
         .into(imageView)
     }