Merge remote-tracking branch 'origin/develop' into deprecated_pager

# Conflicts: # app/src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt # app/src/main/kotlin/com/wire/android/ui/authentication/welcome/WelcomeScreen.kt # app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt # app/src/main/kotlin/com/wire/android/ui/home/conversations/messagedetails/MessageDetailsScreen.kt # app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchPeopleRouter.kt # app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt # app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt
wireapp · Aug 3, 2023 · ceadb61 · ceadb61
2 parents 5cbdc6f + 64a9ff5
commit ceadb61
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
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
@@ -9,16 +9,14 @@ data class AudioState(
         val DEFAULT = AudioState(AudioMediaPlayingState.Stopped, 0, TotalTimeInMs.NotKnown)
     }
 
-    // before the user decides to play audio message, we are not able to determine total time ourself using
-    // MediaPlayer API, we are relying on the info retrieved from the other client, until then
-    fun sanitizeTotalTime(otherClientTotalTime: Int): AudioState {
-        if (totalTimeInMs is TotalTimeInMs.NotKnown) {
-            if (otherClientTotalTime != 0) {
-                return copy(totalTimeInMs = TotalTimeInMs.Known(otherClientTotalTime))
-            }
+    // if the back-end returned the total time, we use that, in case it didn't we use what we get from
+    // the [ConversationAudioMessagePlayer.kt] which will emit the time once the users play the audio.
+    fun sanitizeTotalTime(otherClientTotalTime: Int): TotalTimeInMs {
+        if (otherClientTotalTime != 0) {
+           return TotalTimeInMs.Known(otherClientTotalTime)
         }
 
-        return this
+        return totalTimeInMs
     }
 
     sealed class TotalTimeInMs {

diff --git a/app/src/main/kotlin/com/wire/android/media/audiomessage/ConversationAudioMessagePlayer.kt b/app/src/main/kotlin/com/wire/android/media/audiomessage/ConversationAudioMessagePlayer.kt
@@ -2,6 +2,7 @@ package com.wire.android.media.audiomessage
 
 import android.content.Context
 import android.media.MediaPlayer
+import android.media.MediaPlayer.SEEK_CLOSEST_SYNC
 import android.net.Uri
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.feature.asset.GetMessageAssetUseCase
@@ -110,7 +111,9 @@ class ConversationAudioMessagePlayer
                     audioMessageStateHistory = audioMessageStateHistory.toMutableMap().apply {
                         put(
                             audioMessageStateUpdate.messageId,
-                            currentState.copy(totalTimeInMs = AudioState.TotalTimeInMs.Known(audioMessageStateUpdate.totalTimeInMs))
+                            currentState.copy(
+                                totalTimeInMs = AudioState.TotalTimeInMs.Known(audioMessageStateUpdate.totalTimeInMs)
+                            )
                         )
                     }
                 }
@@ -241,7 +244,7 @@ class ConversationAudioMessagePlayer
             val isAudioMessageCurrentlyPlaying = currentAudioMessageId == messageId
 
             if (isAudioMessageCurrentlyPlaying) {
-                audioMediaPlayer.seekTo(position)
+                audioMediaPlayer.seekTo(position.toLong(), SEEK_CLOSEST_SYNC)
             }
         }
 

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
@@ -547,14 +547,14 @@ private fun MessageContent(
             val audioMessageState: AudioState = audioMessagesState[message.header.messageId]
                 ?: AudioState.DEFAULT
 
-            val adjustedMessageState: AudioState = remember(audioMessagesState) {
+            val totalTimeInMs = remember(audioMessageState.totalTimeInMs) {
                 audioMessageState.sanitizeTotalTime(messageContent.audioMessageDurationInMs.toInt())
             }
 
             AudioMessage(
-                audioMediaPlayingState = adjustedMessageState.audioMediaPlayingState,
-                totalTimeInMs = adjustedMessageState.totalTimeInMs,
-                currentPositionInMs = adjustedMessageState.currentPositionInMs,
+                audioMediaPlayingState = audioMessageState.audioMediaPlayingState,
+                totalTimeInMs = totalTimeInMs,
+                currentPositionInMs = audioMessageState.currentPositionInMs,
                 onPlayButtonClick = { onAudioClick(message.header.messageId) },
                 onSliderPositionChange = { position ->
                     onChangeAudioPosition(message.header.messageId, position.toInt())

diff --git a/...n/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt b/...n/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
@@ -127,7 +127,6 @@ fun GroupConversationDetailsScreen(
                 participant.isSelf -> navigator.navigate(NavigationCommand(SelfUserProfileScreenDestination))
                 participant.isService && participant.botService != null ->
                     navigator.navigate(NavigationCommand(ServiceDetailsScreenDestination(participant.botService, viewModel.conversationId)))
-
                 else -> navigator.navigate(NavigationCommand(OtherUserProfileScreenDestination(participant.id, viewModel.conversationId)))
             }
         },

diff --git a/app/src/main/kotlin/com/wire/android/ui/markdown/MarkdownComposer.kt b/app/src/main/kotlin/com/wire/android/ui/markdown/MarkdownComposer.kt
@@ -48,6 +48,7 @@ import org.commonmark.node.Link
 import org.commonmark.node.Node
 import org.commonmark.node.OrderedList
 import org.commonmark.node.Paragraph
+import org.commonmark.node.SoftLineBreak
 import org.commonmark.node.StrongEmphasis
 import org.commonmark.node.Text
 import org.commonmark.node.ThematicBreak
@@ -158,9 +159,8 @@ fun inlineChildren(
                 annotatedString.pop()
             }
 
-            is HardLineBreak -> {
+            is HardLineBreak, is SoftLineBreak -> {
                 annotatedString.append("\n")
-                annotatedString.pop()
             }
 
             is Link -> {

diff --git a/app/src/main/kotlin/com/wire/android/util/ui/StyledStringUtil.kt b/app/src/main/kotlin/com/wire/android/util/ui/StyledStringUtil.kt
@@ -89,6 +89,7 @@ fun Resources.annotatedText(
                 else -> {
                     pushStyle(style = toSpanStyle(normalStyle, useErrorColorIfApplies(isErrorString, errorColor, normalColor)))
                     append(piece)
+                    pop()
                 }
             }
         }

diff --git a/kalium b/kalium