Use kotlin.time.Duration instead of java.time.Duration. Also use Duration in TimelineItemVideoContent, like in TimelineItemAudioContent and TimelineItemVoiceContent

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt

@@ -47,8 +47,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageT
 import io.element.android.libraries.matrix.ui.messages.toHtmlDocument
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
-import java.time.Duration
 import javax.inject.Inject
+import kotlin.time.Duration
 
 class TimelineItemContentMessageFactory @Inject constructor(
     private val fileSizeFormatter: FileSizeFormatter,
@@ -104,7 +104,7 @@ class TimelineItemContentMessageFactory @Inject constructor(
                     mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream,
                     width = messageType.info?.width?.toInt(),
                     height = messageType.info?.height?.toInt(),
-                    duration = messageType.info?.duration?.toMillis() ?: 0L,
+                    duration = messageType.info?.duration ?: Duration.ZERO,
                     blurHash = messageType.info?.blurhash,
                     aspectRatio = aspectRatio,
                     formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0),

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt

@@ -18,7 +18,7 @@ package io.element.android.features.messages.impl.timeline.model.event
 
 import io.element.android.features.messages.impl.media.helper.formatFileExtensionAndSize
 import io.element.android.libraries.matrix.api.media.MediaSource
-import java.time.Duration
+import kotlin.time.Duration
 
 data class TimelineItemAudioContent(
     val body: String,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContentProvider.kt

@@ -19,7 +19,7 @@ package io.element.android.features.messages.impl.timeline.model.event
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.media.MediaSource
-import java.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 open class TimelineItemAudioContentProvider : PreviewParameterProvider<TimelineItemAudioContent> {
     override val values: Sequence<TimelineItemAudioContent>
@@ -35,6 +35,6 @@ fun aTimelineItemAudioContent(fileName: String = "A sound.mp3") = TimelineItemAu
     mimeType = MimeTypes.Pdf,
     formattedFileSize = "100kB",
     fileExtension = "mp3",
-    duration = Duration.ofMillis(100),
+    duration = 100.milliseconds,
     mediaSource = MediaSource(""),
 )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt

@@ -17,10 +17,11 @@
 package io.element.android.features.messages.impl.timeline.model.event
 
 import io.element.android.libraries.matrix.api.media.MediaSource
+import kotlin.time.Duration
 
 data class TimelineItemVideoContent(
     val body: String,
-    val duration: Long,
+    val duration: Duration,
     val videoSource: MediaSource,
     val thumbnailSource: MediaSource?,
     val aspectRatio: Float?,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
+import kotlin.time.Duration.Companion.milliseconds
 
 open class TimelineItemVideoContentProvider : PreviewParameterProvider<TimelineItemVideoContent> {
     override val values: Sequence<TimelineItemVideoContent>
@@ -35,7 +36,7 @@ fun aTimelineItemVideoContent() = TimelineItemVideoContent(
     thumbnailSource = null,
     blurHash = A_BLUR_HASH,
     aspectRatio = 0.5f,
-    duration = 100,
+    duration = 100.milliseconds,
     videoSource = MediaSource(""),
     height = 300,
     width = 150,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt

@@ -19,7 +19,7 @@ package io.element.android.features.messages.impl.timeline.model.event
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import kotlinx.collections.immutable.ImmutableList
-import java.time.Duration
+import kotlin.time.Duration
 
 data class TimelineItemVoiceContent(
     val eventId: EventId?,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt

@@ -21,21 +21,23 @@ 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 kotlinx.collections.immutable.toPersistentList
-import java.time.Duration
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.minutes
 
 open class TimelineItemVoiceContentProvider : PreviewParameterProvider<TimelineItemVoiceContent> {
     override val values: Sequence<TimelineItemVoiceContent>
         get() = sequenceOf(
             aTimelineItemVoiceContent(
-                durationMs = 1,
+                duration = 1.milliseconds,
                 waveform = listOf(),
             ),
             aTimelineItemVoiceContent(
-                durationMs = 10_000,
+                duration = 10_000.milliseconds,
                 waveform = listOf(0f, 1f, 2f, 3f, 4f, 5f, 6f, 7f, 8f, 9f, 8f, 7f, 6f, 5f, 4f, 3f, 2f, 1f, 0f),
             ),
             aTimelineItemVoiceContent(
-                durationMs = 1_800_000, // 30 minutes
+                duration = 30.minutes,
                 waveform = List(1024) { it / 1024f },
             ),
         )
@@ -44,14 +46,14 @@ open class TimelineItemVoiceContentProvider : PreviewParameterProvider<TimelineI
 fun aTimelineItemVoiceContent(
     eventId: String? = "\$anEventId",
     body: String = "body doesn't really matter for a voice message",
-    durationMs: Long = 61_000,
+    duration: Duration = 61_000.milliseconds,
     contentUri: String = "mxc://matrix.org/1234567890abcdefg",
     mimeType: String = MimeTypes.Ogg,
     waveform: List<Float> = listOf(0f, 1f, 2f, 3f, 4f, 5f, 6f, 7f, 8f, 9f, 8f, 7f, 6f, 5f, 4f, 3f, 2f, 1f, 0f),
 ) = TimelineItemVoiceContent(
     eventId = eventId?.let { EventId(it) },
     body = body,
-    duration = Duration.ofMillis(durationMs),
+    duration = duration,
     mediaSource = MediaSource(contentUri),
     mimeType = mimeType,
     waveform = waveform.toPersistentList(),

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPlayer.kt

@@ -201,6 +201,7 @@ class VoiceMessageComposerPlayer @Inject constructor(
                 progress = 0f,
             )
         }
+
         /**
          * Whether this player is currently playing.
          */
@@ -212,7 +213,6 @@ class VoiceMessageComposerPlayer @Inject constructor(
         val isStopped get() = this.playState == PlayState.Stopped
     }
 
-
     enum class PlayState {
         /**
          * The player is stopped, i.e. it has just been initialised.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenter.kt

@@ -98,7 +98,7 @@ class VoiceMessagePresenter @AssistedInject constructor(
             }
         }
         val duration by remember {
-            derivedStateOf { playerState.duration ?: content.duration.toMillis() }
+            derivedStateOf { playerState.duration ?: content.duration.inWholeMilliseconds }
         }
         val progress by remember {
             derivedStateOf {

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt

@@ -264,7 +264,7 @@ class MessagesPresenterTest {
             val mediaMessage = aMessageEvent(
                 content = TimelineItemVideoContent(
                     body = "video.mp4",
-                    duration = 10L,
+                    duration = 10.milliseconds,
                     videoSource = MediaSource(AN_AVATAR_URL),
                     thumbnailSource = MediaSource(AN_AVATAR_URL),
                     mimeType = MimeTypes.Mp4,

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt

@@ -58,8 +58,8 @@ import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import java.time.Duration
+import kotlin.time.Duration
-import java.time.Duration.ofMinutes
+import kotlin.time.Duration.Companion.minutes
 
 class TimelineItemContentMessageFactoryTest {
 
@@ -140,7 +140,7 @@ class TimelineItemContentMessageFactoryTest {
         )
         val expected = TimelineItemVideoContent(
             body = "body",
-            duration = 0,
+            duration = Duration.ZERO,
             videoSource = MediaSource(url = "url", json = null),
             thumbnailSource = null,
             aspectRatio = null,
@@ -163,7 +163,7 @@ class TimelineItemContentMessageFactoryTest {
                     body = "body.mp4",
                     source = MediaSource("url"),
                     info = VideoInfo(
-                        duration = ofMinutes(1),
+                        duration = 1.minutes,
                         height = 100,
                         width = 300,
                         mimetype = MimeTypes.Mp4,
@@ -184,7 +184,7 @@ class TimelineItemContentMessageFactoryTest {
         )
         val expected = TimelineItemVideoContent(
             body = "body.mp4",
-            duration = 60_000,
+            duration = 1.minutes,
             videoSource = MediaSource(url = "url", json = null),
             thumbnailSource = MediaSource("url_thumbnail"),
             aspectRatio = 3f,
@@ -226,7 +226,7 @@ class TimelineItemContentMessageFactoryTest {
                     body = "body.mp3",
                     source = MediaSource("url"),
                     info = AudioInfo(
-                        duration = ofMinutes(1),
+                        duration = 1.minutes,
                         size = 123L,
                         mimetype = MimeTypes.Mp3,
                     )
@@ -237,7 +237,7 @@ class TimelineItemContentMessageFactoryTest {
         )
         val expected = TimelineItemAudioContent(
             body = "body.mp3",
-            duration = ofMinutes(1),
+            duration = 1.minutes,
             mediaSource = MediaSource(url = "url", json = null),
             mimeType = MimeTypes.Mp3,
             formattedFileSize = "123 Bytes",
@@ -274,12 +274,13 @@ class TimelineItemContentMessageFactoryTest {
                     body = "body.ogg",
                     source = MediaSource("url"),
                     info = AudioInfo(
-                        duration = ofMinutes(1),
+                        duration = 1.minutes,
                         size = 123L,
                         mimetype = MimeTypes.Ogg,
                     ),
                     details = AudioDetails(
-                        duration = ofMinutes(1), waveform = listOf(1f, 2f)
+                        duration = 1.minutes,
+                        waveform = listOf(1f, 2f),
                     ),
                 )
             ),
@@ -289,7 +290,7 @@ class TimelineItemContentMessageFactoryTest {
         val expected = TimelineItemVoiceContent(
             eventId = AN_EVENT_ID,
             body = "body.ogg",
-            duration = ofMinutes(1),
+            duration = 1.minutes,
             mediaSource = MediaSource(url = "url", json = null),
             mimeType = MimeTypes.Ogg,
             waveform = listOf(1f, 2f).toImmutableList()

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessagePresenterTest.kt

@@ -29,6 +29,7 @@ import io.element.android.services.analytics.test.FakeAnalyticsService
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
+import kotlin.time.Duration.Companion.milliseconds
 
 class VoiceMessagePresenterTest {
     @Test
@@ -49,7 +50,7 @@ class VoiceMessagePresenterTest {
     fun `pressing play downloads and plays`() = runTest {
         val presenter = createVoiceMessagePresenter(
             mediaPlayer = FakeMediaPlayer(fakeTotalDurationMs = 2_000),
-            content = aTimelineItemVoiceContent(durationMs = 2_000),
+            content = aTimelineItemVoiceContent(duration = 2_000.milliseconds),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -87,7 +88,7 @@ class VoiceMessagePresenterTest {
             mediaPlayer = FakeMediaPlayer(fakeTotalDurationMs = 2_000),
             voiceMessageMediaRepo = FakeVoiceMessageMediaRepo().apply { shouldFail = true },
             analyticsService = analyticsService,
-            content = aTimelineItemVoiceContent(durationMs = 2_000),
+            content = aTimelineItemVoiceContent(duration = 2_000.milliseconds),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -123,7 +124,7 @@ class VoiceMessagePresenterTest {
     fun `pressing pause while playing pauses`() = runTest {
         val presenter = createVoiceMessagePresenter(
             mediaPlayer = FakeMediaPlayer(fakeTotalDurationMs = 2_000),
-            content = aTimelineItemVoiceContent(durationMs = 2_000),
+            content = aTimelineItemVoiceContent(duration = 2_000.milliseconds),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -172,7 +173,7 @@ class VoiceMessagePresenterTest {
     fun `seeking before play`() = runTest {
         val presenter = createVoiceMessagePresenter(
             mediaPlayer = FakeMediaPlayer(fakeTotalDurationMs = 2_000),
-            content = aTimelineItemVoiceContent(durationMs = 10_000),
+            content = aTimelineItemVoiceContent(duration = 10_000.milliseconds),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -196,7 +197,7 @@ class VoiceMessagePresenterTest {
     @Test
     fun `seeking after play`() = runTest {
         val presenter = createVoiceMessagePresenter(
-            content = aTimelineItemVoiceContent(durationMs = 10_000),
+            content = aTimelineItemVoiceContent(duration = 10_000.milliseconds),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioDetails.kt

@@ -16,7 +16,7 @@
 
 package io.element.android.libraries.matrix.api.media
 
-import java.time.Duration
+import kotlin.time.Duration
 
 data class AudioDetails(
     val duration: Duration,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/AudioInfo.kt

@@ -16,7 +16,7 @@
 
 package io.element.android.libraries.matrix.api.media
 
-import java.time.Duration
+import kotlin.time.Duration
 
 data class AudioInfo(
     val duration: Duration?,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/VideoInfo.kt

@@ -16,7 +16,7 @@
 
 package io.element.android.libraries.matrix.api.media
 
-import java.time.Duration
+import kotlin.time.Duration
 
 data class VideoInfo(
     val duration: Duration?,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioDetails.kt

@@ -17,15 +17,17 @@
 package io.element.android.libraries.matrix.impl.media
 
 import io.element.android.libraries.matrix.api.media.AudioDetails
+import kotlin.time.toJavaDuration
+import kotlin.time.toKotlinDuration
 import org.matrix.rustcomponents.sdk.UnstableAudioDetailsContent as RustAudioDetails
 
 fun RustAudioDetails.map(): AudioDetails = AudioDetails(
-    duration = duration,
+    duration = duration.toKotlinDuration(),
     waveform = waveform.fromMSC3246range(),
 )
 
 fun AudioDetails.map(): RustAudioDetails = RustAudioDetails(
-    duration = duration,
+    duration = duration.toJavaDuration(),
     waveform = waveform.toMSC3246range()
 )
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/AudioInfo.kt

@@ -17,16 +17,18 @@
 package io.element.android.libraries.matrix.impl.media
 
 import io.element.android.libraries.matrix.api.media.AudioInfo
+import kotlin.time.toJavaDuration
+import kotlin.time.toKotlinDuration
 import org.matrix.rustcomponents.sdk.AudioInfo as RustAudioInfo
 
 fun RustAudioInfo.map(): AudioInfo = AudioInfo(
-    duration = duration,
+    duration = duration?.toKotlinDuration(),
     size = size?.toLong(),
     mimetype = mimetype
 )
 
 fun AudioInfo.map(): RustAudioInfo = RustAudioInfo(
-    duration = duration,
+    duration = duration?.toJavaDuration(),
     size = size?.toULong(),
     mimetype = mimetype,
 )

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/VideoInfo.kt

@@ -17,10 +17,12 @@
 package io.element.android.libraries.matrix.impl.media
 
 import io.element.android.libraries.matrix.api.media.VideoInfo
+import kotlin.time.toJavaDuration
+import kotlin.time.toKotlinDuration
 import org.matrix.rustcomponents.sdk.VideoInfo as RustVideoInfo
 
 fun RustVideoInfo.map(): VideoInfo = VideoInfo(
-    duration = duration,
+    duration = duration?.toKotlinDuration(),
     height = height?.toLong(),
     width = width?.toLong(),
     mimetype = mimetype,
@@ -31,7 +33,7 @@ fun RustVideoInfo.map(): VideoInfo = VideoInfo(
 )
 
 fun VideoInfo.map(): RustVideoInfo = RustVideoInfo(
-    duration = duration,
+    duration = duration?.toJavaDuration(),
     height = height?.toULong(),
     width = width?.toULong(),
     mimetype = mimetype,

libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/AndroidMediaPreProcessor.kt

@@ -47,8 +47,9 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.InputStream
-import java.time.Duration
 import javax.inject.Inject
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 @ContributesBinding(AppScope::class)
 class AndroidMediaPreProcessor @Inject constructor(
@@ -269,6 +270,6 @@ fun ImageCompressionResult.toImageInfo(mimeType: String, thumbnailResult: Thumbn
 
 private fun MediaMetadataRetriever.extractDuration(): Duration {
     val durationInMs = extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
-    return Duration.ofMillis(durationInMs)
+    return durationInMs.milliseconds
 }
 

libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt

@@ -24,7 +24,6 @@ import io.element.android.libraries.mediaupload.api.MediaUploadInfo
 import io.element.android.tests.testutils.simulateLongTask
 import java.io.File
 import kotlin.time.Duration.Companion.seconds
-import kotlin.time.toJavaDuration
 
 class FakeMediaPreProcessor : MediaPreProcessor {
 
@@ -63,7 +62,7 @@ class FakeMediaPreProcessor : MediaPreProcessor {
                 MediaUploadInfo.Audio(
                     file = File("audio.ogg"),
                     audioInfo = AudioInfo(
-                        duration = 1000.seconds.toJavaDuration(),
+                        duration = 1000.seconds,
                         size = 1000,
                         mimetype = "audio/ogg",
                     ),