Expose StorageHelper and AttachmentFilter to fix StorageHelperWrapper not instantiable (#5954)

* Expose `StorageHelper` and `AttachmentFilter` to fix `StorageHelperWrapper` not instantiable.

* Update CHANGELOG.md.

* Simplify StorageHelperWrapper instantiation logic.

---------

Co-authored-by: André Mion <[email protected]>

Author: VelikovPetar

CHANGELOG.md

@@ -57,6 +57,7 @@ Fix `Message.channelInfo` not populated when parsing `message.new` event. [#5953
 ### 🐞 Fixed
 - Fix unread separator showing before an uncommitted pending message. [#5945](https://github.com/GetStream/stream-chat-android/pull/5945)
 - Fix unread separator showing before a message that was sent while offline. [#5945](https://github.com/GetStream/stream-chat-android/pull/5945)
+- Expose `StorageHelper` and `AttachmentFilter` as public to fix `StorageHelperWrapper` not instantiable. [#5954](https://github.com/GetStream/stream-chat-android/pull/5954)
 
 ### ⬆️ Improved
 

stream-chat-android-compose/api/stream-chat-android-compose.api

@@ -4669,6 +4669,7 @@ public final class io/getstream/chat/android/compose/ui/util/SearchResultNameFor
 public final class io/getstream/chat/android/compose/ui/util/StorageHelperWrapper {
 	public static final field $stable I
 	public fun <init> (Landroid/content/Context;Lio/getstream/chat/android/ui/common/helper/internal/StorageHelper;Lio/getstream/chat/android/ui/common/helper/internal/AttachmentFilter;)V
+	public synthetic fun <init> (Landroid/content/Context;Lio/getstream/chat/android/ui/common/helper/internal/StorageHelper;Lio/getstream/chat/android/ui/common/helper/internal/AttachmentFilter;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getAttachmentsForUpload (Ljava/util/List;)Ljava/util/List;
 	public final fun getAttachmentsFromUris (Ljava/util/List;)Ljava/util/List;
 	public final fun getAttachmentsMetadataFromUris (Ljava/util/List;)Ljava/util/List;

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/factory/AttachmentsPickerFilesTabFactory.kt

@@ -51,8 +51,6 @@ import io.getstream.chat.android.compose.state.messages.attachments.Files
 import io.getstream.chat.android.compose.ui.components.attachments.files.FilesPicker
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.util.StorageHelperWrapper
-import io.getstream.chat.android.ui.common.helper.internal.AttachmentFilter
-import io.getstream.chat.android.ui.common.helper.internal.StorageHelper
 import io.getstream.chat.android.ui.common.permissions.FilesAccess
 import io.getstream.chat.android.ui.common.permissions.Permissions
 import io.getstream.chat.android.ui.common.state.messages.composer.AttachmentMetaData
@@ -109,7 +107,7 @@ public class AttachmentsPickerFilesTabFactory : AttachmentsPickerTabFactory {
         val context = LocalContext.current
         val lifecycleOwner = LocalLifecycleOwner.current
         val storageHelper: StorageHelperWrapper = remember {
-            StorageHelperWrapper(context, StorageHelper(), AttachmentFilter())
+            StorageHelperWrapper(context)
         }
         var showPermanentlyDeniedSnackBar by remember { mutableStateOf(false) }
         val permissionLauncher =

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/factory/AttachmentsPickerImagesTabFactory.kt

@@ -42,8 +42,6 @@ import io.getstream.chat.android.compose.state.messages.attachments.Images
 import io.getstream.chat.android.compose.ui.components.attachments.images.ImagesPicker
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.util.StorageHelperWrapper
-import io.getstream.chat.android.ui.common.helper.internal.AttachmentFilter
-import io.getstream.chat.android.ui.common.helper.internal.StorageHelper
 import io.getstream.chat.android.ui.common.permissions.Permissions
 import io.getstream.chat.android.ui.common.permissions.VisualMediaAccess
 import io.getstream.chat.android.ui.common.state.messages.composer.AttachmentMetaData
@@ -101,7 +99,7 @@ public class AttachmentsPickerImagesTabFactory : AttachmentsPickerTabFactory {
         val context = LocalContext.current
         val lifecycleOwner = LocalLifecycleOwner.current
         val storageHelper: StorageHelperWrapper =
-            remember { StorageHelperWrapper(context, StorageHelper(), AttachmentFilter()) }
+            remember { StorageHelperWrapper(context) }
         val mediaAccess by visualMediaAccessAsState(context, lifecycleOwner) { value ->
             if (value != VisualMediaAccess.DENIED) {
                 val media = storageHelper.getMedia()

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/factory/AttachmentsPickerSystemTabFactory.kt

@@ -77,7 +77,6 @@ import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.compose.ui.util.StorageHelperWrapper
 import io.getstream.chat.android.compose.ui.util.clickable
 import io.getstream.chat.android.ui.common.helper.internal.AttachmentFilter
-import io.getstream.chat.android.ui.common.helper.internal.StorageHelper
 import io.getstream.chat.android.ui.common.permissions.SystemAttachmentsPickerConfig
 import io.getstream.chat.android.ui.common.permissions.toContractVisualMediaType
 import io.getstream.chat.android.ui.common.state.messages.composer.AttachmentMetaData
@@ -210,7 +209,7 @@ public class AttachmentsPickerSystemTabFactory(
     ) {
         val context = LocalContext.current
         val storageHelper: StorageHelperWrapper = remember {
-            StorageHelperWrapper(context, StorageHelper(), AttachmentFilter())
+            StorageHelperWrapper(context)
         }
 
         val filePickerLauncher = rememberFilePickerLauncher { uri ->

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/util/StorageHelperWrapper.kt

@@ -35,8 +35,8 @@ import io.getstream.chat.android.ui.common.state.messages.composer.AttachmentMet
  */
 public class StorageHelperWrapper(
     private val context: Context,
-    private val storageHelper: StorageHelper,
-    private val attachmentFilter: AttachmentFilter,
+    private val storageHelper: StorageHelper = StorageHelper(),
+    private val attachmentFilter: AttachmentFilter = AttachmentFilter(),
 ) {
 
     /**

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/messages/MessagesViewModelFactory.kt

@@ -36,8 +36,6 @@ import io.getstream.chat.android.ui.common.feature.messages.list.MessageListCont
 import io.getstream.chat.android.ui.common.feature.messages.list.MessagePositionHandler
 import io.getstream.chat.android.ui.common.helper.ClipboardHandler
 import io.getstream.chat.android.ui.common.helper.ClipboardHandlerImpl
-import io.getstream.chat.android.ui.common.helper.internal.AttachmentFilter
-import io.getstream.chat.android.ui.common.helper.internal.StorageHelper
 import io.getstream.chat.android.ui.common.state.messages.list.DeletedMessageVisibility
 import io.getstream.chat.android.ui.common.state.messages.list.MessageFooterVisibility
 import io.getstream.chat.android.ui.common.utils.AttachmentConstants
@@ -163,11 +161,7 @@ public class MessagesViewModelFactory(
             )
         },
         AttachmentsPickerViewModel::class.java to {
-            AttachmentsPickerViewModel(
-                StorageHelperWrapper(context, StorageHelper(), AttachmentFilter()),
-                channelStateFlow,
-
-            )
+            AttachmentsPickerViewModel(StorageHelperWrapper(context), channelStateFlow)
         },
     )
 

stream-chat-android-ui-common/api/stream-chat-android-ui-common.api

@@ -1105,6 +1105,27 @@ public abstract interface class io/getstream/chat/android/ui/common/helper/Video
 	public abstract fun getVideoRequestHeaders (Ljava/lang/String;)Ljava/util/Map;
 }
 
+public final class io/getstream/chat/android/ui/common/helper/internal/AttachmentFilter {
+	public static final field $stable I
+	public fun <init> ()V
+	public fun <init> (Lio/getstream/chat/android/client/ChatClient;)V
+	public synthetic fun <init> (Lio/getstream/chat/android/client/ChatClient;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun filterAttachments (Ljava/util/List;)Ljava/util/List;
+	public final fun getSupportedMimeTypes ()Ljava/util/List;
+}
+
+public final class io/getstream/chat/android/ui/common/helper/internal/StorageHelper {
+	public static final field $stable I
+	public static final field Companion Lio/getstream/chat/android/ui/common/helper/internal/StorageHelper$Companion;
+	public static final field FILE_NAME_PREFIX Ljava/lang/String;
+	public static final field TIME_FORMAT Ljava/lang/String;
+	public fun <init> ()V
+	public final fun getAttachmentsFromUriList (Landroid/content/Context;Ljava/util/List;)Ljava/util/List;
+	public final fun getCachedFileFromUri (Landroid/content/Context;Lio/getstream/chat/android/ui/common/state/messages/composer/AttachmentMetaData;)Ljava/io/File;
+	public final fun getFileAttachments (Landroid/content/Context;)Ljava/util/List;
+	public final fun getMediaAttachments (Landroid/content/Context;)Ljava/util/List;
+}
+
 public final class io/getstream/chat/android/ui/common/helper/internal/StorageHelper$Companion {
 }
 

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/helper/internal/AttachmentFilter.kt

@@ -18,7 +18,6 @@ package io.getstream.chat.android.ui.common.helper.internal
 
 import androidx.core.content.MimeTypeFilter
 import io.getstream.chat.android.client.ChatClient
-import io.getstream.chat.android.core.internal.InternalStreamChatApi
 import io.getstream.chat.android.models.AttachmentType
 import io.getstream.chat.android.ui.common.state.messages.composer.AttachmentMetaData
 import io.getstream.log.taggedLogger
@@ -31,7 +30,6 @@ import io.getstream.log.taggedLogger
  *
  * @param chatClient An instance of the low level chat client to fetch upload config.
  */
-@InternalStreamChatApi
 public class AttachmentFilter(
     private val chatClient: ChatClient = ChatClient.instance(),
 ) {

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/helper/internal/StorageHelper.kt

@@ -22,19 +22,47 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.MediaStore
 import android.webkit.MimeTypeMap
-import io.getstream.chat.android.core.internal.InternalStreamChatApi
 import io.getstream.chat.android.models.AttachmentType
 import io.getstream.chat.android.ui.common.state.messages.composer.AttachmentMetaData
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-@InternalStreamChatApi
+/**
+ * Helper class for managing file and media attachments from device storage.
+ *
+ * This class provides utilities to:
+ * - Query files and media from the device's MediaStore
+ * - Cache remote or content URI files to local storage
+ * - Parse attachment metadata from content URIs
+ *
+ * The class uses Android's MediaStore API to retrieve file information and should be called
+ * from a background thread when querying large datasets to avoid blocking the main thread.
+ *
+ * @see AttachmentMetaData
+ */
 @Suppress("TooManyFunctions")
 public class StorageHelper {
     private val dateFormat = SimpleDateFormat(TIME_FORMAT, Locale.US)
 
+    /**
+     * Retrieves or creates a cached copy of a file from the given attachment metadata.
+     *
+     * This method handles two scenarios:
+     * 1. If [AttachmentMetaData.file] is already set, it returns the file directly
+     * 2. If only [AttachmentMetaData.uri] is available, it copies the content to a cache file
+     *
+     * The cached file is stored in a unique timestamped folder within the app's cache directory
+     * to prevent naming conflicts. The file name is derived from the attachment's title with
+     * proper extension handling.
+     *
+     * @param context The Android context used to access the content resolver and cache directory.
+     * @param attachmentMetaData The attachment metadata containing either a file or URI reference.
+     * @return A [File] object pointing to the cached file, or `null` if both file and URI are null.
+     *
+     * @throws java.io.IOException If there's an error reading from the URI or writing to cache.
+     */
     public fun getCachedFileFromUri(
         context: Context,
         attachmentMetaData: AttachmentMetaData,
@@ -55,6 +83,22 @@ public class StorageHelper {
         return cachedFile
     }
 
+    /**
+     * Retrieves all file attachments from the device's external storage.
+     *
+     * This method queries the MediaStore for all files that have a valid MIME type, excluding
+     * folders and files with unknown types. The results are sorted by date added in descending
+     * order (most recent first).
+     *
+     * Note: This method performs a potentially expensive query operation and should be called
+     * from a background thread to avoid blocking the UI.
+     *
+     * @param context The Android context used to access the content resolver.
+     * @return A list of [AttachmentMetaData] objects representing all files on the device,
+     *         or an empty list if the query fails or returns no results.
+     *
+     * @see getMediaAttachments For retrieving only images and videos.
+     */
     public fun getFileAttachments(context: Context): List<AttachmentMetaData> {
         // Excluding files with empty mime type just to be sure that we won't include folder and unknown files
         return getFilteredAttachments(
@@ -64,6 +108,25 @@ public class StorageHelper {
         )
     }
 
+    /**
+     * Retrieves all media attachments (images and videos) from the device's external storage.
+     *
+     * This method queries the MediaStore specifically for files with media type IMAGE or VIDEO,
+     * filtering out all other file types. The results are sorted by date added in descending
+     * order (most recent first).
+     *
+     * The returned metadata includes video duration for video files, which is useful for
+     * displaying in the UI or for validation purposes.
+     *
+     * Note: This method performs a potentially expensive query operation and should be called
+     * from a background thread to avoid blocking the UI.
+     *
+     * @param context The Android context used to access the content resolver.
+     * @return A list of [AttachmentMetaData] objects representing all images and videos on the device,
+     *         or an empty list if the query fails or returns no results.
+     *
+     * @see getFileAttachments For retrieving all file types.
+     */
     public fun getMediaAttachments(context: Context): List<AttachmentMetaData> {
         val selection = (
             MediaStore.Files.FileColumns.MEDIA_TYPE + "=" +
@@ -75,35 +138,27 @@ public class StorageHelper {
         return getFilteredAttachments(context, selection)
     }
 
-    private fun getFilteredAttachments(context: Context, selection: String?): List<AttachmentMetaData> {
-        val columns = arrayOf(
-            MediaStore.Files.FileColumns._ID,
-            MediaStore.Files.FileColumns.DISPLAY_NAME,
-            MediaStore.Files.FileColumns.MIME_TYPE,
-            MediaStore.Files.FileColumns.SIZE,
-            MediaStore.Files.FileColumns.DURATION,
-        )
-        context.contentResolver.query(
-            MediaStore.Files.getContentUri("external"),
-            columns,
-            selection,
-            null,
-            "${MediaStore.Files.FileColumns.DATE_ADDED} DESC",
-        )?.use { cursor ->
-            return mutableListOf<AttachmentMetaData>().apply {
-                while (cursor.moveToNext()) {
-                    add(getAttachmentFromCursor(cursor))
-                }
-            }
-        }
-        return emptyList()
-    }
-
     /**
-     * Queries the given list of content URI and returns the parsed metadata.
+     * Queries a list of content URIs and returns parsed attachment metadata for each.
      *
-     * @param uriList The list of URIs, using the content:// scheme.
-     * @return A list of objects with parsed metadata for the list of URIs.
+     * This method is useful when you have specific URIs (e.g., from an intent or file picker)
+     * and need to extract their metadata for attachment processing. Each URI is queried
+     * individually using the content resolver to retrieve:
+     * - Display name
+     * - MIME type (with fallback to content resolver type)
+     * - File size
+     *
+     * URIs that cannot be queried or return no data are filtered out from the result.
+     * The attachment type (image, video, or file) is automatically determined based on
+     * the MIME type.
+     *
+     * @param context The Android context used to access the content resolver.
+     * @param uriList The list of content URIs (using the `content://` scheme) to query.
+     * @return A list of [AttachmentMetaData] objects with parsed metadata. URIs that fail
+     *         to resolve are omitted from the result.
+     *
+     * @see getFileAttachments For querying all files from device storage.
+     * @see getMediaAttachments For querying all media from device storage.
      */
     public fun getAttachmentsFromUriList(context: Context, uriList: List<Uri>): List<AttachmentMetaData> {
         return uriList.mapNotNull { uri ->
@@ -152,6 +207,30 @@ public class StorageHelper {
         }
     }
 
+    private fun getFilteredAttachments(context: Context, selection: String?): List<AttachmentMetaData> {
+        val columns = arrayOf(
+            MediaStore.Files.FileColumns._ID,
+            MediaStore.Files.FileColumns.DISPLAY_NAME,
+            MediaStore.Files.FileColumns.MIME_TYPE,
+            MediaStore.Files.FileColumns.SIZE,
+            MediaStore.Files.FileColumns.DURATION,
+        )
+        context.contentResolver.query(
+            MediaStore.Files.getContentUri("external"),
+            columns,
+            selection,
+            null,
+            "${MediaStore.Files.FileColumns.DATE_ADDED} DESC",
+        )?.use { cursor ->
+            return mutableListOf<AttachmentMetaData>().apply {
+                while (cursor.moveToNext()) {
+                    add(getAttachmentFromCursor(cursor))
+                }
+            }
+        }
+        return emptyList()
+    }
+
     private fun getAttachmentFromCursor(cursor: Cursor): AttachmentMetaData {
         val displayNameIndex = cursor.getColumnIndex(MediaStore.Files.FileColumns.DISPLAY_NAME)
         val fileSizeIndex = cursor.getColumnIndex(MediaStore.Files.FileColumns.SIZE)