Skip to content

Commit fa2ac28

Browse files
authored
fix: When sending media as files use the application/octet-stream mime type (#4815)
This ensures there is no media pre-processing applied, but also has the side effect of not sending a thumbnail as we (incorrectly) did until now.
1 parent 4f81336 commit fa2ac28

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.compose.runtime.rememberUpdatedState
2424
import androidx.compose.runtime.saveable.rememberSaveable
2525
import androidx.compose.runtime.setValue
2626
import androidx.compose.runtime.snapshots.SnapshotStateList
27-
import androidx.media3.common.MimeTypes
2827
import androidx.media3.common.util.UnstableApi
2928
import dagger.assisted.Assisted
3029
import dagger.assisted.AssistedFactory
@@ -42,6 +41,7 @@ import io.element.android.features.messages.impl.timeline.TimelineController
4241
import io.element.android.features.messages.impl.utils.TextPillificationHelper
4342
import io.element.android.libraries.architecture.Presenter
4443
import io.element.android.libraries.core.extensions.runCatchingExceptions
44+
import io.element.android.libraries.core.mimetype.MimeTypes
4545
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
4646
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
4747
import io.element.android.libraries.featureflag.api.FeatureFlagService
@@ -166,13 +166,13 @@ class MessageComposerPresenter @AssistedInject constructor(
166166
handlePickedMedia(uri, mimeType)
167167
}
168168
val filesPicker = mediaPickerProvider.registerFilePicker(AnyMimeTypes) { uri ->
169-
handlePickedMedia(uri)
169+
handlePickedMedia(uri, MimeTypes.OctetStream)
170170
}
171171
val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker { uri ->
172-
handlePickedMedia(uri, MimeTypes.IMAGE_JPEG)
172+
handlePickedMedia(uri, MimeTypes.Jpeg)
173173
}
174174
val cameraVideoPicker = mediaPickerProvider.registerCameraVideoPicker { uri ->
175-
handlePickedMedia(uri, MimeTypes.VIDEO_MP4)
175+
handlePickedMedia(uri, MimeTypes.Mp4)
176176
}
177177
val isFullScreen = rememberSaveable {
178178
mutableStateOf(false)

0 commit comments

Comments
 (0)