From 1df381780881053e978401567302f7eadb29fcba Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 27 Nov 2023 21:55:39 +0100 Subject: [PATCH] Use MimeTypes object instead of hard-coded strings. --- .../composer/VoiceMessageComposerPlayer.kt | 3 ++- .../voicemessages/timeline/VoiceMessagePlayer.kt | 3 ++- .../event/TimelineItemContentMessageFactoryTest.kt | 12 ++++++------ .../timeline/DefaultVoiceMessageMediaRepoTest.kt | 3 ++- .../timeline/DefaultVoiceMessagePlayerTest.kt | 3 ++- .../timeline/RedactedVoiceMessageManagerTest.kt | 5 +++-- .../libraries/androidutils/system/SystemUtils.kt | 3 ++- .../libraries/mediaupload/api/MediaSenderTests.kt | 11 ++++++----- libraries/mediaupload/test/build.gradle.kts | 1 + .../mediaupload/test/FakeMediaPreProcessor.kt | 5 +++-- .../voicerecorder/impl/di/VoiceRecorderModule.kt | 3 ++- .../voicerecorder/impl/VoiceRecorderImplTest.kt | 5 +++-- libraries/voicerecorder/test/build.gradle.kts | 1 + .../voicerecorder/test/FakeVoiceRecorder.kt | 3 ++- 14 files changed, 37 insertions(+), 24 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt index eb165e89a2..0e1b960ecc 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt @@ -16,6 +16,7 @@ package io.element.android.features.messages.impl.voicemessages.composer +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.mediaplayer.api.MediaPlayer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job @@ -41,7 +42,7 @@ class VoiceMessageComposerPlayer @Inject constructor( private val coroutineScope: CoroutineScope, ) { companion object { - const val MIME_TYPE = "audio/ogg" + const val MIME_TYPE = MimeTypes.Ogg } private var mediaPath: String? = null diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePlayer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePlayer.kt index a6f002c38a..76180397f4 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePlayer.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePlayer.kt @@ -17,6 +17,7 @@ package io.element.android.features.messages.impl.voicemessages.timeline import com.squareup.anvil.annotations.ContributesBinding +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.di.RoomScope import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.media.MediaSource @@ -196,7 +197,7 @@ class DefaultVoiceMessagePlayer( mediaPlayer.setMedia( uri = mediaFile.path, mediaId = eventId.value, - mimeType = "audio/ogg", // Files in the voice cache have no extension so we need to set the mime type manually. + mimeType = MimeTypes.Ogg, // Files in the voice cache have no extension so we need to set the mime type manually. startPositionMs = if (state.isEnded) 0L else state.currentPosition, ) } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt index ced0d8806f..8c8af4589b 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt @@ -147,7 +147,7 @@ class TimelineItemContentMessageFactoryTest { blurHash = null, height = null, width = null, - mimeType = "application/octet-stream", + mimeType = MimeTypes.OctetStream, formattedFileSize = "0 Bytes", fileExtension = "", ) @@ -210,7 +210,7 @@ class TimelineItemContentMessageFactoryTest { body = "body", duration = Duration.ZERO, mediaSource = MediaSource(url = "url", json = null), - mimeType = "application/octet-stream", + mimeType = MimeTypes.OctetStream, formattedFileSize = "0 Bytes", fileExtension = "", ) @@ -259,7 +259,7 @@ class TimelineItemContentMessageFactoryTest { body = "body", duration = Duration.ZERO, mediaSource = MediaSource(url = "url", json = null), - mimeType = "application/octet-stream", + mimeType = MimeTypes.OctetStream, waveform = emptyList().toImmutableList() ) assertThat(result).isEqualTo(expected) @@ -316,7 +316,7 @@ class TimelineItemContentMessageFactoryTest { body = "body", duration = Duration.ZERO, mediaSource = MediaSource(url = "url", json = null), - mimeType = "application/octet-stream", + mimeType = MimeTypes.OctetStream, formattedFileSize = "0 Bytes", fileExtension = "" ) @@ -337,7 +337,7 @@ class TimelineItemContentMessageFactoryTest { thumbnailSource = null, formattedFileSize = "0 Bytes", fileExtension = "", - mimeType = "application/octet-stream", + mimeType = MimeTypes.OctetStream, blurhash = null, width = null, height = null, @@ -402,7 +402,7 @@ class TimelineItemContentMessageFactoryTest { thumbnailSource = null, formattedFileSize = "0 Bytes", fileExtension = "", - mimeType = "application/octet-stream" + mimeType = MimeTypes.OctetStream ) assertThat(result).isEqualTo(expected) } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt index d9587b5e9b..e562d66815 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt @@ -17,6 +17,7 @@ package io.element.android.features.messages.impl.voicemessages.timeline import com.google.common.truth.Truth +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.matrix.api.media.MatrixMediaLoader import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.test.media.FakeMediaLoader @@ -143,7 +144,7 @@ private fun createDefaultVoiceMessageMediaRepo( url = mxcUri, json = null ), - mimeType = "audio/ogg", + mimeType = MimeTypes.Ogg, body = "someBody.ogg" ) diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt index 23830fdf39..c84487da1d 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessagePlayerTest.kt @@ -19,6 +19,7 @@ package io.element.android.features.messages.impl.voicemessages.timeline import app.cash.turbine.TurbineTestContext import app.cash.turbine.test import com.google.common.truth.Truth +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.test.AN_EVENT_ID @@ -287,7 +288,7 @@ private fun createDefaultVoiceMessagePlayer( url = MXC_URI, json = null ), - mimeType = "audio/ogg", + mimeType = MimeTypes.Ogg, body = "someBody.ogg" ) diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt index 644f1fe231..8e776d1eea 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt @@ -17,6 +17,7 @@ package io.element.android.features.messages.impl.voicemessages.timeline import com.google.common.truth.Truth +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo @@ -37,7 +38,7 @@ class RedactedVoiceMessageManagerTest { @Test fun `redacted event - no playing related media`() = runTest { val mediaPlayer = FakeMediaPlayer().apply { - setMedia(uri = "someUri", mediaId = AN_EVENT_ID.value, mimeType = "audio/ogg") + setMedia(uri = "someUri", mediaId = AN_EVENT_ID.value, mimeType = MimeTypes.Ogg) play() } val manager = aDefaultRedactedVoiceMessageManager(mediaPlayer = mediaPlayer) @@ -54,7 +55,7 @@ class RedactedVoiceMessageManagerTest { @Test fun `redacted event - playing related media is paused`() = runTest { val mediaPlayer = FakeMediaPlayer().apply { - setMedia(uri = "someUri", mediaId = AN_EVENT_ID.value, mimeType = "audio/ogg") + setMedia(uri = "someUri", mediaId = AN_EVENT_ID.value, mimeType = MimeTypes.Ogg) play() } val manager = aDefaultRedactedVoiceMessageManager(mediaPlayer = mediaPlayer) diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt index 42eb81d4a7..422307ffd9 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/SystemUtils.kt @@ -29,6 +29,7 @@ import androidx.annotation.ChecksSdkIntAtLeast import androidx.annotation.RequiresApi import io.element.android.libraries.androidutils.R import io.element.android.libraries.androidutils.compat.getApplicationInfoCompat +import io.element.android.libraries.core.mimetype.MimeTypes @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O) fun supportNotificationChannels() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O @@ -125,7 +126,7 @@ fun Context.startSharePlainTextIntent( noActivityFoundMessage: String = getString(R.string.error_no_compatible_app_found), ) { val share = Intent(Intent.ACTION_SEND) - share.type = "text/plain" + share.type = MimeTypes.PlainText share.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT) // Add data to the intent, the receiving app will decide what to do with it. share.putExtra(Intent.EXTRA_SUBJECT, subject) diff --git a/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTests.kt b/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTests.kt index 480cf8065f..35aee8b2d5 100644 --- a/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTests.kt +++ b/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTests.kt @@ -18,6 +18,7 @@ package io.element.android.libraries.mediaupload.api import android.net.Uri import com.google.common.truth.Truth.assertThat +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.matrix.api.room.MatrixRoom import io.element.android.libraries.matrix.test.room.FakeMatrixRoom import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor @@ -39,7 +40,7 @@ class MediaSenderTests { val sender = aMediaSender(preProcessor) val uri = Uri.parse("content://image.jpg") - sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true) + sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true) assertThat(preProcessor.processCallCount).isEqualTo(1) } @@ -50,7 +51,7 @@ class MediaSenderTests { val sender = aMediaSender(room = room) val uri = Uri.parse("content://image.jpg") - sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true) + sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true) assertThat(room.sendMediaCount).isEqualTo(1) } @@ -63,7 +64,7 @@ class MediaSenderTests { val sender = aMediaSender(preProcessor) val uri = Uri.parse("content://image.jpg") - val result = sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true) + val result = sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true) assertThat(result.exceptionOrNull()).isNotNull() } @@ -76,7 +77,7 @@ class MediaSenderTests { val sender = aMediaSender(room = room) val uri = Uri.parse("content://image.jpg") - val result = sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true) + val result = sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true) assertThat(result.exceptionOrNull()).isNotNull() } @@ -88,7 +89,7 @@ class MediaSenderTests { val sender = aMediaSender(room = room) val sendJob = launch { val uri = Uri.parse("content://image.jpg") - sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true) + sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true) } // Wait until several internal tasks run and the file is being uploaded advanceTimeBy(3L) diff --git a/libraries/mediaupload/test/build.gradle.kts b/libraries/mediaupload/test/build.gradle.kts index 956afffbe0..a0d3ed35cc 100644 --- a/libraries/mediaupload/test/build.gradle.kts +++ b/libraries/mediaupload/test/build.gradle.kts @@ -24,5 +24,6 @@ android { dependencies { api(projects.libraries.mediaupload.api) + implementation(projects.libraries.core) implementation(projects.tests.testutils) } diff --git a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt index 34457da1b2..0c612c8d1c 100644 --- a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt +++ b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt @@ -17,6 +17,7 @@ package io.element.android.libraries.mediaupload.test import android.net.Uri +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.matrix.api.media.AudioInfo import io.element.android.libraries.matrix.api.media.FileInfo import io.element.android.libraries.mediaupload.api.MediaPreProcessor @@ -34,7 +35,7 @@ class FakeMediaPreProcessor : MediaPreProcessor { MediaUploadInfo.AnyFile( File("test"), FileInfo( - mimetype = "*/*", + mimetype = MimeTypes.Any, size = 999L, thumbnailInfo = null, thumbnailSource = null, @@ -64,7 +65,7 @@ class FakeMediaPreProcessor : MediaPreProcessor { audioInfo = AudioInfo( duration = 1000.seconds, size = 1000, - mimetype = "audio/ogg", + mimetype = MimeTypes.Ogg, ), ) ) diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt index b21ab48ac3..29071a9879 100644 --- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt +++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/di/VoiceRecorderModule.kt @@ -21,6 +21,7 @@ import android.media.MediaRecorder import com.squareup.anvil.annotations.ContributesTo import dagger.Module import dagger.Provides +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.di.RoomScope import io.element.android.libraries.voicerecorder.impl.audio.AudioConfig import io.element.android.libraries.voicerecorder.impl.audio.SampleRate @@ -50,7 +51,7 @@ object VoiceRecorderModule { VoiceFileConfig( cacheSubdir = "voice_recordings", fileExt = "ogg", - mimeType = "audio/ogg", + mimeType = MimeTypes.Ogg, ) @Provides diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt index d67a44f6f3..030545a3bc 100644 --- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt +++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt @@ -21,6 +21,7 @@ import android.media.MediaRecorder import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.appconfig.VoiceMessageConfig +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.voicerecorder.api.VoiceRecorderState import io.element.android.libraries.voicerecorder.impl.audio.Audio import io.element.android.libraries.voicerecorder.impl.audio.AudioConfig @@ -85,7 +86,7 @@ class VoiceRecorderImplTest { assertThat(awaitItem()).isEqualTo( VoiceRecorderState.Finished( file = File(FILE_PATH), - mimeType = "audio/ogg", + mimeType = MimeTypes.Ogg, waveform = List(100) { 1f }, duration = VoiceMessageConfig.maxVoiceMessageDuration, ) @@ -107,7 +108,7 @@ class VoiceRecorderImplTest { assertThat(awaitItem()).isEqualTo( VoiceRecorderState.Finished( file = File(FILE_PATH), - mimeType = "audio/ogg", + mimeType = MimeTypes.Ogg, waveform = List(100) { 1f }, duration = 5.seconds, ) diff --git a/libraries/voicerecorder/test/build.gradle.kts b/libraries/voicerecorder/test/build.gradle.kts index 9628825380..1dc91ab108 100644 --- a/libraries/voicerecorder/test/build.gradle.kts +++ b/libraries/voicerecorder/test/build.gradle.kts @@ -28,4 +28,5 @@ dependencies { implementation(libs.coroutines.test) implementation(libs.test.truth) + implementation(projects.libraries.core) } diff --git a/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt b/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt index bc8bda59d1..c4cc1da0ae 100644 --- a/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt +++ b/libraries/voicerecorder/test/src/main/kotlin/io/element/android/libraries/voicerecorder/test/FakeVoiceRecorder.kt @@ -17,6 +17,7 @@ package io.element.android.libraries.voicerecorder.test import com.google.common.truth.Truth.assertThat +import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.voicerecorder.api.VoiceRecorder import io.element.android.libraries.voicerecorder.api.VoiceRecorderState import kotlinx.coroutines.flow.MutableStateFlow @@ -73,7 +74,7 @@ class FakeVoiceRecorder( null -> VoiceRecorderState.Idle else -> VoiceRecorderState.Finished( file = curRecording!!, - mimeType = "audio/ogg", + mimeType = MimeTypes.Ogg, duration = recordingDuration, waveform = waveform, )