Merge branch 'develop' into add-folder-type-as-attachement-type

ohassine · web-flow · commit 5069473ca9c6 · 2025-05-13T14:49:25.000+01:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -134,6 +134,7 @@ android {
 aboutLibraries {
     val isAboutLibrariesDisabled = System.getenv("DISABLE_ABOUT_LIBRARIES")?.equals("true", true) ?: false
     registerAndroidTasks = !isAboutLibrariesDisabled
+    excludeFields = arrayOf("generated")
 }
 
 dependencies {
diff --git a/app/src/main/kotlin/com/wire/android/di/AppModule.kt b/app/src/main/kotlin/com/wire/android/di/AppModule.kt
@@ -39,7 +39,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import linc.com.amplituda.Amplituda
+import com.linc.amplituda.Amplituda
 import javax.inject.Named
 import javax.inject.Qualifier
 import javax.inject.Singleton
diff --git a/app/src/main/kotlin/com/wire/android/mapper/MessageDateGroupingMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/MessageDateGroupingMapper.kt
@@ -27,7 +27,6 @@ private const val ONE_MINUTE_FROM_MILLIS = 60 * 1000
 private const val THIRTY_MINUTES = 30
 private const val ONE_WEEK_IN_DAYS = 7
 private const val ONE_DAY = 1
-private const val FORTY_FIVE_MINUTES_DIFFERENCE = 45
 private const val MINIMUM_DAYS_DIFFERENCE = 1
 
 fun String.shouldDisplayDatesDifferenceDivider(previousDate: String): Boolean {
@@ -36,17 +35,12 @@ fun String.shouldDisplayDatesDifferenceDivider(previousDate: String): Boolean {
     val currentLocalDateTime = currentDate.serverDate()?.toInstant()?.atZone(ZoneId.systemDefault())?.toLocalDateTime()
     val previousLocalDateTime = previousDate.serverDate()?.toInstant()?.atZone(ZoneId.systemDefault())?.toLocalDateTime()
 
-    val differenceInMinutes = ChronoUnit.MINUTES.between(
-        currentLocalDateTime,
-        previousLocalDateTime
-    )
-
     val differenceInDays = ChronoUnit.DAYS.between(
         currentLocalDateTime,
         previousLocalDateTime
     )
 
-    return differenceInMinutes > FORTY_FIVE_MINUTES_DIFFERENCE || differenceInDays >= MINIMUM_DAYS_DIFFERENCE
+    return differenceInDays >= MINIMUM_DAYS_DIFFERENCE
 }
 
 fun String.groupedUIMessageDateTime(now: Long): MessageDateTimeGroup? = this
diff --git a/app/src/main/kotlin/com/wire/android/media/audiomessage/AudioState.kt b/app/src/main/kotlin/com/wire/android/media/audiomessage/AudioState.kt
@@ -32,10 +32,10 @@ data class AudioState(
     val audioMediaPlayingState: AudioMediaPlayingState,
     val currentPositionInMs: Int,
     val totalTimeInMs: TotalTimeInMs,
-    val wavesMask: List<Int>
+    val wavesMask: List<Int>?
 ) {
     companion object {
-        val DEFAULT = AudioState(AudioMediaPlayingState.Stopped, 0, TotalTimeInMs.NotKnown, listOf())
+        val DEFAULT = AudioState(AudioMediaPlayingState.Stopped, 0, TotalTimeInMs.NotKnown, null)
     }
 
     // if the back-end returned the total time, we use that, in case it didn't we use what we get from
@@ -146,7 +146,7 @@ sealed class AudioMediaPlayerStateUpdate(
     data class WaveMaskUpdate(
         override val conversationId: ConversationId,
         override val messageId: String,
-        val waveMask: List<Int>
+        val waveMask: List<Int>?
     ) : AudioMediaPlayerStateUpdate(conversationId, messageId)
 }
 
diff --git a/app/src/main/kotlin/com/wire/android/media/audiomessage/AudioWavesMaskHelper.kt b/app/src/main/kotlin/com/wire/android/media/audiomessage/AudioWavesMaskHelper.kt
@@ -17,30 +17,42 @@
  */
 package com.wire.android.media.audiomessage
 
-import linc.com.amplituda.Amplituda
-import linc.com.amplituda.Cache
+import android.content.Context
+import dagger.Lazy
+import com.linc.amplituda.Amplituda
+import com.linc.amplituda.Cache
+import dagger.Reusable
 import okio.Path
 import java.io.File
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
+@Reusable
 class AudioWavesMaskHelper @Inject constructor(
-    private val amplituda: Amplituda
+    private val amplituda: Lazy<Amplituda>
 ) {
 
+    lateinit var context: Context
     companion object {
         private const val WAVES_AMOUNT = 75
         private const val WAVE_MAX = 32
     }
 
-    fun getWaveMask(decodedAssetPath: Path): List<Int> = getWaveMask(File(decodedAssetPath.toString()))
+    @Suppress("TooGenericExceptionCaught")
+    private fun getAmplituda(): Amplituda? = try {
+        amplituda.get()
+    } catch (e: NullPointerException) {
+        null
+    }
+
+    fun getWaveMask(decodedAssetPath: Path): List<Int>? = getWaveMask(File(decodedAssetPath.toString()))
 
-    fun getWaveMask(file: File): List<Int> = amplituda
-        .processAudio(file, Cache.withParams(Cache.REUSE))
-        .get()
-        .amplitudesAsList()
-        .averageWavesMask()
-        .equalizeWavesMask()
+    fun getWaveMask(file: File): List<Int>? = getAmplituda()
+        ?.processAudio(file, Cache.withParams(Cache.REUSE))
+        ?.get()
+        ?.amplitudesAsList()
+        ?.averageWavesMask()
+        ?.equalizeWavesMask()
 
     private fun List<Double>.equalizeWavesMask(): List<Int> {
         if (this.isEmpty()) return listOf()
@@ -76,6 +88,6 @@ class AudioWavesMaskHelper @Inject constructor(
     }
 
     fun clear() {
-        amplituda.clearCache()
+        getAmplituda()?.clearCache()
     }
 }
diff --git a/app/src/main/kotlin/com/wire/android/media/audiomessage/RecordAudioMessagePlayer.kt b/app/src/main/kotlin/com/wire/android/media/audiomessage/RecordAudioMessagePlayer.kt
@@ -184,11 +184,13 @@ class RecordAudioMessagePlayer @Inject constructor(
         audioMediaPlayer.seekTo(position)
         audioMediaPlayer.start()
 
-        audioMessageStateUpdate.emit(
-            RecordAudioMediaPlayerStateUpdate.WaveMaskUpdate(
-                wavesMaskHelper.getWaveMask(audioFile)
+        wavesMaskHelper.getWaveMask(audioFile)?.let { waveMask ->
+            audioMessageStateUpdate.emit(
+                RecordAudioMediaPlayerStateUpdate.WaveMaskUpdate(
+                    waveMask = waveMask
+                )
             )
-        )
+        }
 
         audioMessageStateUpdate.emit(
             RecordAudioMediaPlayerStateUpdate.RecordAudioMediaPlayingStateUpdate(
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt
@@ -1368,39 +1368,31 @@ private fun MessageGroupDateTime(
 
         is MessageDateTimeGroup.Daily -> {
             when (messageDateTimeGroup.type) {
-                MessageDateTimeGroup.Daily.Type.Today -> DateUtils.getRelativeDateTimeString(
-                    context,
-                    messageDateTime.time,
-                    DateUtils.DAY_IN_MILLIS,
-                    DateUtils.DAY_IN_MILLIS,
-                    0
-                ).toString()
-
+                MessageDateTimeGroup.Daily.Type.Today,
                 MessageDateTimeGroup.Daily.Type.Yesterday ->
-                    DateUtils.getRelativeDateTimeString(
-                        context,
+                    DateUtils.getRelativeTimeSpanString(
                         messageDateTime.time,
+                        now,
                         DateUtils.DAY_IN_MILLIS,
-                        DateUtils.DAY_IN_MILLIS * 2,
                         0
                     ).toString()
 
                 MessageDateTimeGroup.Daily.Type.WithinWeek -> DateUtils.formatDateTime(
                     context,
                     messageDateTime.time,
-                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME
+                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE
                 )
 
                 MessageDateTimeGroup.Daily.Type.NotWithinWeekButSameYear -> DateUtils.formatDateTime(
                     context,
                     messageDateTime.time,
-                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME
+                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE
                 )
 
                 MessageDateTimeGroup.Daily.Type.Other -> DateUtils.formatDateTime(
                     context,
                     messageDateTime.time,
-                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR or DateUtils.FORMAT_SHOW_TIME
+                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR
                 )
             }
         }
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/messagetypes/audio/AudioMessageType.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/messagetypes/audio/AudioMessageType.kt
@@ -335,12 +335,12 @@ fun SuccessfulAudioMessageContent(
 private fun AudioMessageSlider(
     audioDuration: AudioDuration,
     totalTimeInMs: AudioState.TotalTimeInMs,
-    waveMask: List<Int>,
+    waveMask: List<Int>?,
     onSliderPositionChange: (Float) -> Unit,
 ) {
     Box(modifier = Modifier.fillMaxWidth()) {
         val totalMs = if (totalTimeInMs is AudioState.TotalTimeInMs.Known) totalTimeInMs.value.toFloat() else 0f
-        val waves = waveMask.ifEmpty { getDefaultWaveMask() }
+        val waves = waveMask?.ifEmpty { getDefaultWaveMask() } ?: getDefaultWaveMask()
         val wavesAmount = waves.size
 
         Row(
diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt
@@ -1,7 +1,8 @@
 New
-- Swipe left to react
-
+ - Swipe left to add reactions to a message
+Improvement
+- Using QR codes with federation
 Fixes
-- QR code with Federation
-- Schema restriction for sharing assets
-- App stuck while processing MLS messages
+- Resolved a security issue when sharing files, pictures, or audio and video messages
+- Fixed an issue when people couldn't open conversations from a notification
+- Resolved a syncing issue on slow internet
diff --git a/build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt b/build-logic/plugins/src/main/kotlin/AndroidCoordinates.kt
@@ -26,7 +26,7 @@ object AndroidSdk {
 
 object AndroidApp {
     const val id = "com.wire.android"
-    const val versionName = "4.12.3"
+    const val versionName = "4.13.0"
     val versionCode by lazy {
         Versionizer(_rootDir).versionCode
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,7 +44,7 @@ androidx-biometric = "1.1.0"
 androidx-startup = "1.2.0"
 androidx-compose-runtime = "1.7.2"
 compose-qr = "1.0.1"
-amplituda = "2.2.2"
+amplituda = "2.3.0"
 
 # Compose
 composeBom = "2024.12.01"

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ android {`
`134`	`134`	`aboutLibraries {`
`135`	`135`	`val isAboutLibrariesDisabled = System.getenv("DISABLE_ABOUT_LIBRARIES")?.equals("true", true) ?: false`
`136`	`136`	`registerAndroidTasks = !isAboutLibrariesDisabled`
	`137`	`+ excludeFields = arrayOf("generated")`
`137`	`138`	`}`
`138`	`139`
`139`	`140`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ object AndroidSdk {`
`26`	`26`
`27`	`27`	`object AndroidApp {`
`28`	`28`	`const val id = "com.wire.android"`
`29`		`- const val versionName = "4.12.3"`
	`29`	`+ const val versionName = "4.13.0"`
`30`	`30`	`val versionCode by lazy {`
`31`	`31`	`Versionizer(_rootDir).versionCode`
`32`	`32`	`}`