Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Benoit Marty 2023-11-27 21:58:28 +01:00 • committed by Benoit Marty
parent b8436fc77e
commit 9059126b2e
20 changed files with 57 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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,

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

@ -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?,

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

@ -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?,

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

@ -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()
)

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

@ -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,
)

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

@ -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,

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

@ -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
}

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

@ -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",
),