Update uploader FileType to not be sealed and remove unneeded property (#149)

* Update uploader FileType to not be sealed and remove unneeded format

* Update stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/file/StreamFeedUploaderTest.kt

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Petar Velikov <[email protected]>

Author: 3 people

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/file/FileType.kt

@@ -22,16 +22,8 @@ package io.getstream.feeds.android.client.api.file
  * This is used to differentiate between file types that may require different handling or
  * validation, such as images versus other generic files.
  */
-public sealed interface FileType {
-    public data class Image(val format: String) : FileType
+public interface FileType {
+    public data object Image : FileType
 
-    public data class Other(val format: String) : FileType
+    public data object Other : FileType
 }
-
-/**
- * A convenience extension property to check if a [FileType] is an image.
- *
- * @return `true` if this instance is an image, `false` otherwise.
- */
-public val FileType.isImage: Boolean
-    get() = this is FileType.Image

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/file/UploadPayload.kt

@@ -25,8 +25,7 @@ import java.io.File
  * type, and the contextual metadata required to process it.
  *
  * @property file The local [File] object on disk that is to be uploaded.
- * @property type The semantic type of the file, represented by the [FileType] sealed interface.
- *   This helps differentiate between images, videos, documents, etc.
+ * @property type The semantic type of the file, represented by the [FileType] interface.
  * @property context The metadata required to process the upload.
  */
 public data class UploadPayload<C : UploadContext>(

stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/file/StreamFeedUploader.kt

@@ -19,8 +19,8 @@ package io.getstream.feeds.android.client.internal.file
 import io.getstream.android.core.result.runSafely
 import io.getstream.feeds.android.client.api.file.FeedUploadPayload
 import io.getstream.feeds.android.client.api.file.FeedUploader
+import io.getstream.feeds.android.client.api.file.FileType
 import io.getstream.feeds.android.client.api.file.UploadedFile
-import io.getstream.feeds.android.client.api.file.isImage
 import io.getstream.feeds.android.client.internal.http.ProgressRequestBody
 import java.io.File
 import okhttp3.MediaType
@@ -45,7 +45,12 @@ internal class StreamFeedUploader(
                 body = requestBody,
             )
 
-        val response = if (payload.type.isImage) cdnApi.sendImage(part) else cdnApi.sendFile(part)
+        val response =
+            if (payload.type == FileType.Image) {
+                cdnApi.sendImage(part)
+            } else {
+                cdnApi.sendFile(part)
+            }
 
         UploadedFile(
             fileUrl = response.file ?: throw IllegalStateException("Uploaded file URL is null"),

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/file/StreamFeedUploaderTest.kt

@@ -49,7 +49,7 @@ internal class StreamFeedUploaderTest {
         coEvery { cdnApi.sendFile(any()) } returns uploadResponse
         val expectedResult =
             Result.success(UploadedFile(fileUrl = "file", thumbnailUrl = "thumbnail"))
-        val payload = FeedUploadPayload(file = File("test.txt"), type = FileType.Other("txt"))
+        val payload = FeedUploadPayload(file = File("test.txt"), type = FileType.Other)
 
         val result = uploader.upload(payload)
 
@@ -62,7 +62,7 @@ internal class StreamFeedUploaderTest {
         coEvery { cdnApi.sendImage(any()) } returns uploadResponse
         val expectedResult =
             Result.success(UploadedFile(fileUrl = "img", thumbnailUrl = "thumbnail"))
-        val payload = FeedUploadPayload(file = File("test.png"), type = FileType.Image("png"))
+        val payload = FeedUploadPayload(file = File("test.png"), type = FileType.Image)
 
         val result = uploader.upload(payload)
 
@@ -72,7 +72,7 @@ internal class StreamFeedUploaderTest {
     @Test
     fun `upload when a progress listener is provided, then notify progress`() = runTest {
         val file = temporaryFolder.newFile("test.png").apply { writeText("dummy file content") }
-        val payload = FeedUploadPayload(file = file, type = FileType.Image("png"))
+        val payload = FeedUploadPayload(file = file, type = FileType.Image)
         val progressListener: (Double) -> Unit = mockk(relaxed = true)
         val uploadResponse = FileUploadResponse(duration = "", file = "img", thumbUrl = "thumbnail")
         coEvery { cdnApi.sendImage(any()) } answers

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/ActivitiesRepositoryImplTest.kt

@@ -71,8 +71,8 @@ internal class ActivitiesRepositoryImplTest {
     fun `on addActivity, upload attachments and send api request`() = runTest {
         val attachmentUploads =
             listOf(
-                FeedUploadPayload(File("1"), FileType.Image("jpg")),
-                FeedUploadPayload(File("2"), FileType.Image("png")),
+                FeedUploadPayload(File("1"), FileType.Image),
+                FeedUploadPayload(File("2"), FileType.Image),
             )
         val request =
             FeedAddActivityRequest(
@@ -111,7 +111,7 @@ internal class ActivitiesRepositoryImplTest {
 
     @Test
     fun `addActivity on upload error return failure`() = runTest {
-        val attachmentUploads = listOf(FeedUploadPayload(File("some file"), FileType.Image("jpg")))
+        val attachmentUploads = listOf(FeedUploadPayload(File("some file"), FileType.Image))
         val request =
             FeedAddActivityRequest(
                 request = AddActivityRequest(type = "post", text = "Nice post"),

stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/CommentsRepositoryImplTest.kt

@@ -67,8 +67,8 @@ internal class CommentsRepositoryImplTest {
     fun `on addComment, upload attachments and send api request`() = runTest {
         val attachmentUploads =
             listOf(
-                FeedUploadPayload(File("1"), FileType.Image("jpg")),
-                FeedUploadPayload(File("2"), FileType.Image("png")),
+                FeedUploadPayload(File("1"), FileType.Image),
+                FeedUploadPayload(File("2"), FileType.Image),
             )
         val request =
             ActivityAddCommentRequest(
@@ -101,7 +101,7 @@ internal class CommentsRepositoryImplTest {
 
     @Test
     fun `addComment on error return failure`() = runTest {
-        val attachmentUploads = listOf(FeedUploadPayload(File("some file"), FileType.Image("jpg")))
+        val attachmentUploads = listOf(FeedUploadPayload(File("some file"), FileType.Image))
         val request =
             ActivityAddCommentRequest(
                 request =
@@ -122,8 +122,8 @@ internal class CommentsRepositoryImplTest {
 
     @Test
     fun `on addCommentsBatch, upload attachments and send api request`() = runTest {
-        val payload1 = FeedUploadPayload(File("1"), FileType.Image("jpg"))
-        val payload2 = FeedUploadPayload(File("2"), FileType.Image("png"))
+        val payload1 = FeedUploadPayload(File("1"), FileType.Image)
+        val payload2 = FeedUploadPayload(File("2"), FileType.Image)
         val requests =
             listOf(
                 ActivityAddCommentRequest(

stream-feeds-android-sample/src/main/java/io/getstream/feeds/android/sample/feed/CommentsSheetViewModel.kt

@@ -151,7 +151,7 @@ constructor(
                             createNotificationActivity = true,
                             attachmentUploads =
                                 attachmentFiles.map {
-                                    FeedUploadPayload(file = it, type = FileType.Image("jpeg"))
+                                    FeedUploadPayload(file = it, type = FileType.Image)
                                 },
                         ),
                         attachmentUploadProgress = { file, progress ->

stream-feeds-android-sample/src/main/java/io/getstream/feeds/android/sample/feed/FeedViewModel.kt

@@ -259,7 +259,7 @@ constructor(private val application: Application, loginManager: LoginManager) :
             text = text,
             feeds = listOf(feedId.rawValue),
             expiresAt = if (isStory) Clock.System.now().plus(1.days).toString() else null,
-            attachmentUploads = attachments.map { FeedUploadPayload(it, FileType.Image("jpeg")) },
+            attachmentUploads = attachments.map { FeedUploadPayload(it, FileType.Image) },
         )
 
     fun onCreatePoll(poll: PollFormData) {