Merge branch 'release/candidate' into fix/get_e2ei_certificate_button…

…_when_no_certificate-cherry-pick

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt

@@ -186,7 +186,7 @@ fun ConversationProtocolDetails(
             if (protocolInfo is Conversation.ProtocolInfo.MLS) {
                 ProtocolDetails(
                     label = UIText.StringResource(R.string.cipher_suite),
-                    text = UIText.DynamicString(protocolInfo.cipherSuite.name)
+                    text = UIText.DynamicString(protocolInfo.cipherSuite.toString())
                 )
 
                 if (BuildConfig.PRIVATE_BUILD) {

app/src/main/kotlin/com/wire/android/ui/home/conversations/sendmessage/SendMessageViewModel.kt

@@ -36,6 +36,7 @@ import com.wire.android.ui.home.conversations.usecase.HandleUriAssetUseCase
 import com.wire.android.ui.home.messagecomposer.model.ComposableMessageBundle
 import com.wire.android.ui.home.messagecomposer.model.MessageBundle
 import com.wire.android.ui.home.messagecomposer.model.Ping
+import com.wire.android.util.AUDIO_MIME_TYPE
 import com.wire.android.util.ImageUtil
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.android.util.getAudioLengthInMs
@@ -67,8 +68,6 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okio.Path
-import okio.Path.Companion.toPath
 import javax.inject.Inject
 
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -165,8 +164,8 @@ class SendMessageViewModel @Inject constructor(
             is ComposableMessageBundle.AudioMessageBundle -> {
                 handleAssetMessageBundle(
                     attachmentUri = messageBundle.attachmentUri,
-                    audioPath = messageBundle.attachmentUri.uri.path?.toPath(),
-                    conversationId = messageBundle.conversationId
+                    conversationId = messageBundle.conversationId,
+                    specifiedMimeType = AUDIO_MIME_TYPE,
                 )
             }
 
@@ -208,12 +207,12 @@ class SendMessageViewModel @Inject constructor(
     private suspend fun handleAssetMessageBundle(
         conversationId: ConversationId,
         attachmentUri: UriAsset,
-        audioPath: Path? = null
+        specifiedMimeType: String? = null, // specify a particular mimetype, otherwise it will be taken from the uri / file extension
     ) {
         when (val result = handleUriAsset.invoke(
             uri = attachmentUri.uri,
             saveToDeviceIfInvalid = attachmentUri.saveToDeviceIfInvalid,
-            audioPath = audioPath
+            specifiedMimeType = specifiedMimeType
         )) {
             is HandleUriAssetUseCase.Result.Failure.AssetTooLarge -> {
                 assetTooLargeDialogState = AssetTooLargeDialogState.Visible(

app/src/main/kotlin/com/wire/android/ui/home/conversations/usecase/HandleUriAssetUseCase.kt

@@ -25,7 +25,7 @@ import com.wire.kalium.logic.data.asset.AttachmentType
 import com.wire.kalium.logic.data.asset.KaliumFileSystem
 import com.wire.kalium.logic.feature.asset.GetAssetSizeLimitUseCase
 import kotlinx.coroutines.withContext
-import okio.Path
+import java.util.UUID
 import javax.inject.Inject
 
 class HandleUriAssetUseCase @Inject constructor(
@@ -38,14 +38,13 @@ class HandleUriAssetUseCase @Inject constructor(
     suspend fun invoke(
         uri: Uri,
         saveToDeviceIfInvalid: Boolean = false,
-        audioPath: Path? = null,
+        specifiedMimeType: String? = null, // specify a particular mimetype, otherwise it will be taken from the uri / file extension
     ): Result = withContext(dispatchers.io()) {
-
-        val tempCachePath = kaliumFileSystem.rootCachePath
+        val tempAssetPath = kaliumFileSystem.tempFilePath(UUID.randomUUID().toString())
         val assetBundle = fileManager.getAssetBundleFromUri(
             attachmentUri = uri,
-            tempCachePath = tempCachePath,
-            audioPath = audioPath
+            assetDestinationPath = tempAssetPath,
+            specifiedMimeType = specifiedMimeType,
         )
         if (assetBundle != null) {
             // The max limit for sending assets changes between user and asset types.

app/src/main/kotlin/com/wire/android/ui/sharing/ImportMediaAuthenticatedViewModel.kt

@@ -414,7 +414,7 @@ class ImportMediaAuthenticatedViewModel @Inject constructor(
         }
 
     private suspend fun handleImportedAsset(uri: Uri): ImportedMediaAsset? = withContext(dispatchers.io()) {
-        when (val result = handleUriAsset.invoke(uri, saveToDeviceIfInvalid = false, audioPath = null)) {
+        when (val result = handleUriAsset.invoke(uri, saveToDeviceIfInvalid = false)) {
             is HandleUriAssetUseCase.Result.Failure.AssetTooLarge -> mapToImportedAsset(result.assetBundle, result.maxLimitInMB)
 
             HandleUriAssetUseCase.Result.Failure.Unknown -> null

app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt

@@ -51,7 +51,6 @@ import com.wire.android.util.CustomTabsHelper
 import com.wire.android.util.capitalizeFirstLetter
 import com.wire.android.util.ui.LinkText
 import com.wire.android.util.ui.LinkTextData
-import com.wire.kalium.logic.feature.e2ei.CertificateStatus
 
 @Composable
 fun OtherUserDevicesScreen(
@@ -125,7 +124,7 @@ private fun OtherUserDevicesContent(
                     onClickAction = onDeviceClick,
                     icon = Icons.Filled.ChevronRight.Icon(),
                     shouldShowVerifyLabel = true,
-                    shouldShowE2EIInfo = item.e2eiCertificateStatus == CertificateStatus.VALID
+                    shouldShowE2EIInfo = item.e2eiCertificateStatus != null
                 )
                 if (index < otherUserDevices.lastIndex) WireDivider()
             }

app/src/main/kotlin/com/wire/android/util/FileManager.kt

@@ -108,28 +108,26 @@ class FileManager @Inject constructor(@ApplicationContext private val context: C
     @Suppress("TooGenericExceptionCaught")
     suspend fun getAssetBundleFromUri(
         attachmentUri: Uri,
-        tempCachePath: Path,
-        audioPath: Path? = null,
+        assetDestinationPath: Path,
+        specifiedMimeType: String? = null, // specify a particular mimetype, otherwise it will be taken from the uri / file extension
         dispatcher: DispatcherProvider = DefaultDispatcherProvider(),
     ): AssetBundle? = withContext(dispatcher.io()) {
         try {
             val assetKey = UUID.randomUUID().toString()
             val assetFileName = context.getFileName(attachmentUri)
                 ?: throw IOException("The selected asset has an invalid name")
-            val fullTempAssetPath = "$tempCachePath/${UUID.randomUUID()}".toPath()
-            val assetPath = audioPath ?: fullTempAssetPath
-            val mimeType = if (audioPath != null) AUDIO_MIME_TYPE else attachmentUri
+            val mimeType = specifiedMimeType ?: attachmentUri
                 .getMimeType(context)
                 .orDefault(DEFAULT_FILE_MIME_TYPE)
             val attachmentType = AttachmentType.fromMimeTypeString(mimeType)
             val assetSize = if (attachmentType == AttachmentType.IMAGE) {
-                attachmentUri.resampleImageAndCopyToTempPath(context, fullTempAssetPath)
+                attachmentUri.resampleImageAndCopyToTempPath(context, assetDestinationPath)
             } else {
                 // TODO: We should add also a video resampling logic soon, that way we could drastically reduce as well the number
                 //  of video assets hitting the max limit.
-                copyToPath(attachmentUri, fullTempAssetPath)
+                copyToPath(attachmentUri, assetDestinationPath)
             }
-            AssetBundle(assetKey, mimeType, assetPath, assetSize, assetFileName, attachmentType)
+            AssetBundle(assetKey, mimeType, assetDestinationPath, assetSize, assetFileName, attachmentType)
         } catch (e: IOException) {
             appLogger.e("There was an error while obtaining the file from disk", e)
             null