feat(cells): Download file version (WPB-21661) (#4469)

ohassine · web-flow · commit 2595d0695bd4 · 2025-12-18T14:26:40.000Z
diff --git a/app/src/main/kotlin/com/wire/android/di/accountScoped/CellsModule.kt b/app/src/main/kotlin/com/wire/android/di/accountScoped/CellsModule.kt
@@ -27,6 +27,7 @@ import com.wire.kalium.cells.domain.usecase.AddAttachmentDraftUseCase
 import com.wire.kalium.cells.domain.usecase.CreateFolderUseCase
 import com.wire.kalium.cells.domain.usecase.DeleteCellAssetUseCase
 import com.wire.kalium.cells.domain.usecase.DownloadCellFileUseCase
+import com.wire.kalium.cells.domain.usecase.DownloadCellVersionUseCase
 import com.wire.kalium.cells.domain.usecase.GetAllTagsUseCase
 import com.wire.kalium.cells.domain.usecase.GetCellFileUseCase
 import com.wire.kalium.cells.domain.usecase.GetEditorUrlUseCase
@@ -111,7 +112,7 @@ class CellsModule {
 
     @ViewModelScoped
     @Provides
-    fun provideDownloadUseCase(cellsScope: CellsScope): DownloadCellFileUseCase = cellsScope.downloadFile
+    fun provideDownloadUseCase(cellsScope: CellsScope): DownloadCellFileUseCase = cellsScope.downloadCellFile
 
     @ViewModelScoped
     @Provides
@@ -220,4 +221,9 @@ class CellsModule {
     @Provides
     fun provideRestoreNodeVersionUseCase(cellsScope: CellsScope): RestoreNodeVersionUseCase =
         cellsScope.restoreNodeVersion
+
+    @ViewModelScoped
+    @Provides
+    fun provideDownloadCellVersionUseCase(cellsScope: CellsScope): DownloadCellVersionUseCase =
+        cellsScope.downloadCellVersion
 }
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
@@ -184,7 +184,7 @@ import com.wire.android.util.normalizeLink
 import com.wire.android.util.serverDate
 import com.wire.android.util.ui.PreviewMultipleThemes
 import com.wire.android.util.ui.UIText
-import com.wire.android.util.ui.openDownloadFolder
+import com.wire.android.util.openDownloadFolder
 import com.wire.kalium.common.error.NetworkFailure
 import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.Conversation.TypingIndicatorMode
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt
@@ -75,7 +75,7 @@ import com.wire.android.ui.theme.wireDimensions
 import com.wire.android.util.ui.PreviewMultipleThemes
 import com.wire.android.util.ui.SnackBarMessageHandler
 import com.wire.android.util.ui.UIText
-import com.wire.android.util.ui.openDownloadFolder
+import com.wire.android.util.openDownloadFolder
 import com.wire.kalium.logic.data.id.ConversationId
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/gallery/MediaGalleryScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/gallery/MediaGalleryScreen.kt
@@ -66,7 +66,7 @@ import com.wire.android.util.permission.rememberWriteStoragePermissionFlow
 import com.wire.android.util.startFileShareIntent
 import com.wire.android.util.ui.PreviewMultipleThemes
 import com.wire.android.util.ui.SnackBarMessageHandler
-import com.wire.android.util.ui.openDownloadFolder
+import com.wire.android.util.openDownloadFolder
 
 @OptIn(ExperimentalCoilApi::class)
 @WireDestination(
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1516,7 +1516,6 @@ registriert. Bitte versuchen Sie es mit einer anderen.</string>
     <string name="ten_seconds_short_label">10 Sek</string>
     <string name="label_debug_data">Daten zur Fehlerbehebung</string>
     <string name="label_log_options_description">"Dadurch werden anonymisierte Informationen zur Fehlerbehebung lokal gespeichert. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"Keine Anwendung zum Öffnen des Download-Ordners gefunden"</string>
     <string name="notification_obfuscated_message_title">Jemand</string>
     <string name="notification_obfuscated_message_content">Hat eine selbstlöschende Nachricht gesendet</string>
     <string name="settings_licenses_settings_label">Lizenzen</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -1418,7 +1418,6 @@ Kérjük, próbálja meg újra.</string>
     <string name="label_debug_data">Hibakeresési információ</string>
     <string name="title_internal_debugging">Belső hibakeresés</string>
     <string name="label_log_options_description">"Ez helyileg tárolja az anonimizált hibaelhárítási információkat. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"Nem található alkalmazás a letöltési mappa megnyitásához"</string>
     <string name="notification_obfuscated_message_title">Valaki</string>
     <string name="notification_obfuscated_message_content">Önmegsemmisítő üzenetet küldött</string>
     <string name="settings_licenses_settings_label">Licenc információ</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -1098,7 +1098,6 @@ registrato. Sei pregato di riprovare.</string>
     <string name="label_debug_data">Dati di debug</string>
     <string name="title_internal_debugging">Debug interno</string>
     <string name="label_log_options_description">"Questo memorizza localmente le informazioni anonime di risoluzione dei problemi. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"Nessun'applicazione trovata per aprire la cartella dei download"</string>
     <string name="notification_obfuscated_message_title">Qualcuno</string>
     <string name="notification_obfuscated_message_content">Ha inviato un messaggio a eliminazione automatica</string>
     <string name="settings_licenses_settings_label">Informazioni sulla licenza</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -1358,7 +1358,6 @@ registrado. Tente novamente.</string>
     <string name="label_debug_data">Dados de depuração</string>
     <string name="title_internal_debugging">Depuração interna</string>
     <string name="label_log_options_description">"Isso armazena informações anônimas de solução de problemas localmente. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"Nenhum aplicativo encontrado para abrir a pasta de downloads"</string>
     <string name="notification_obfuscated_message_title">Alguém</string>
     <string name="notification_obfuscated_message_content">Enviou uma mensagem de auto-exclusão</string>
     <string name="settings_licenses_settings_label">Informações de Licença</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -1658,7 +1658,6 @@
     <string name="label_debug_data">Отладочные данные</string>
     <string name="title_internal_debugging">Внутренняя отладка</string>
     <string name="label_log_options_description">"Это позволяет локально сохранять анонимизированную информацию о неполадках. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"Не найдено приложение для открытия папки загрузок"</string>
     <string name="notification_obfuscated_message_title">Кто-то</string>
     <string name="notification_obfuscated_message_content">Отправил самоудаляющееся сообщение</string>
     <string name="settings_licenses_settings_label">Информация о лицензии</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
@@ -1427,7 +1427,6 @@
     <string name="label_debug_data">නිදෝස්කරණ දත්ත</string>
     <string name="title_internal_debugging">අභ්‍යන්තර නිදොස්කරණය</string>
     <string name="label_log_options_description">"මෙය නිර්නාමික දෝෂ නිරාකරණ තොරතුරු ස්ථානීයව ගබඩා කරයි. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"බාගැනීමේ බහාලුම ඇරීමට සුදුසු යෙදුමක් හමු නොවිණි"</string>
     <string name="notification_obfuscated_message_title">යමෙක්</string>
     <string name="notification_obfuscated_message_content">ඉබේ මැකෙන පණිවිඩයක් එවා ඇත</string>
     <string name="settings_licenses_settings_label">බලපත්‍රයෙහි තොරතුරු</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1624,7 +1624,6 @@ In group conversations, the group admin can overwrite this setting.</string>
     <string name="label_debug_data">Debug data</string>
     <string name="title_internal_debugging">Internal debugging</string>
     <string name="label_log_options_description">"This stores anonymized troubleshooting information locally. "</string>
-    <string name="label_no_application_found_open_downloads_folder">"No application found to open downloads folder"</string>
     <string name="notification_obfuscated_message_title">Someone</string>
     <string name="notification_obfuscated_message_content">Sent a self-deleting message</string>
     <string name="settings_licenses_settings_label">License Information</string>
diff --git a/core/ui-common/src/main/kotlin/com/wire/android/util/DownloadFolderOpener.kt b/core/ui-common/src/main/kotlin/com/wire/android/util/DownloadFolderOpener.kt
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2024 Wire Swiss GmbH
+ * Copyright (C) 2025 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see http://www.gnu.org/licenses/.
  */
-package com.wire.android.util.ui
+package com.wire.android.util
 
 import android.app.DownloadManager
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.widget.Toast
+import com.wire.android.ui.common.R
 
-fun openDownloadFolder(context: Context) {
-    val errorToastMessage = context.resources.getString(com.wire.android.R.string.label_no_application_found_open_downloads_folder)
+fun openDownloadFolder(
+    context: Context,
+) {
+    val errorToastMessage = context.resources.getString(R.string.label_no_application_found_open_downloads_folder)
     try {
         context.startActivity(Intent(DownloadManager.ACTION_VIEW_DOWNLOADS))
     } catch (e: ActivityNotFoundException) {
diff --git a/core/ui-common/src/main/kotlin/com/wire/android/util/StringUtils.kt b/core/ui-common/src/main/kotlin/com/wire/android/util/StringUtils.kt
@@ -47,3 +47,14 @@ fun String.toTitleCase(delimiter: String = " ", separator: String = " "): String
 fun String.capitalizeFirstLetter(): String = lowercase().replaceFirstChar(Char::titlecaseChar)
 
 fun String.normalizeFileName(): String = this.replace("/", "")
+
+fun String.addBeforeExtension(insert: String): String {
+    val dotIndex = this.lastIndexOf('.')
+    return if (dotIndex != -1) {
+        val name = this.take(dotIndex)
+        val ext = this.substring(dotIndex)
+        "${name}_$insert$ext"
+    } else {
+        this + insert
+    }
+}
diff --git a/core/ui-common/src/main/res/values-de/strings.xml b/core/ui-common/src/main/res/values-de/strings.xml
@@ -54,4 +54,5 @@
     <string name="size_unit_gigabytes">GB</string>
     <string name="size_unit_terabytes">TB</string>
     <string name="content_description_check">Haken</string>
+    <string name="label_no_application_found_open_downloads_folder">"Keine Anwendung zum Öffnen des Download-Ordners gefunden"</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values-hu/strings.xml b/core/ui-common/src/main/res/values-hu/strings.xml
@@ -18,4 +18,5 @@
   -->
 <resources>
     <string name="content_description_check">Pipa jel</string>
+    <string name="label_no_application_found_open_downloads_folder">"Nem található alkalmazás a letöltési mappa megnyitásához"</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values-it/strings.xml b/core/ui-common/src/main/res/values-it/strings.xml
@@ -18,4 +18,5 @@
   -->
 <resources>
     <string name="content_description_check">Segno di spunta</string>
+    <string name="label_no_application_found_open_downloads_folder">"Nessun'applicazione trovata per aprire la cartella dei download"</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values-pt/strings.xml b/core/ui-common/src/main/res/values-pt/strings.xml
@@ -18,4 +18,5 @@
   -->
 <resources>
     <string name="content_description_check">Marca de seleção</string>
+    <string name="label_no_application_found_open_downloads_folder">"Nenhum aplicativo encontrado para abrir a pasta de downloads"</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values-ru/strings.xml b/core/ui-common/src/main/res/values-ru/strings.xml
@@ -61,4 +61,5 @@
     <string name="size_unit_gigabytes">GB</string>
     <string name="size_unit_terabytes">TB</string>
     <string name="content_description_check">Отметка</string>
+    <string name="label_no_application_found_open_downloads_folder">"Не найдено приложение для открытия папки загрузок"</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values-si/strings.xml b/core/ui-common/src/main/res/values-si/strings.xml
@@ -18,4 +18,5 @@
   -->
 <resources>
     <string name="content_description_check">හරි ලකුණ</string>
+    <string name="label_no_application_found_open_downloads_folder">"බාගැනීමේ බහාලුම ඇරීමට සුදුසු යෙදුමක් හමු නොවිණි"</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values/strings.xml b/core/ui-common/src/main/res/values/strings.xml
@@ -58,8 +58,8 @@
     <string name="label_ok">Ok</string>
     <string name="label_cancel">Cancel</string>
     <string name="label_no_selected_date">No selected date</string>
-
     <string name="content_description_check">Check mark</string>
+    <string name="label_no_application_found_open_downloads_folder">"No application found to open downloads folder"</string>
 
     <string name="size_unit_bytes">B</string>
     <string name="size_unit_kilobytes">KB</string>
diff --git a/default.json b/default.json
@@ -72,7 +72,8 @@
             "analytics_app_key": "8ffae535f1836ed5f58fd5c8a11c00eca07c5438",
             "analytics_server_url": "https://wire.count.ly/",
             "enable_new_registration": true,
-            "use_async_flush_logging": true
+            "use_async_flush_logging": true,
+            "collabora_integration": true
         },
         "internal": {
             "application_id": "com.wire.internal",
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellScreenContent.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellScreenContent.kt
@@ -87,7 +87,7 @@ internal fun CellScreenContent(
     isSearchResult: Boolean = false,
     isFiltering: Boolean = false,
     retryEditNodeError: (String) -> Unit = {},
-    showVersionHistoryScreen: (String, String) -> Unit = { _, _ -> }
+    showVersionHistoryScreen: (String, String) -> Unit = { _, _ -> },
 ) {
 
     val context = LocalContext.current
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/CellVersion.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/CellVersion.kt
@@ -24,7 +24,8 @@ data class CellVersion(
     val modifiedAt: String = "",
     val modifiedBy: String = "",
     val fileSize: String = "",
-    val isCurrentVersion: Boolean = false
+    val isCurrentVersion: Boolean = false,
+    val presignedUrl: String? = null
 )
 
 data class VersionGroup(
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionActionBottomSheet.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionActionBottomSheet.kt
@@ -38,10 +38,10 @@ import com.wire.android.ui.theme.wireDimensions
 
 @Composable
 fun VersionActionBottomSheet(
-    sheetState: WireModalSheetState<CellVersion>,
+    sheetState: WireModalSheetState<Pair<String, CellVersion>>,
     onDismiss: () -> Unit,
     onRestoreVersionClicked: (String) -> Unit,
-    onDownloadVersionClicked: (String) -> Unit,
+    onDownloadVersionClicked: (String, String) -> Unit,
 ) {
     WireModalSheetLayout(
         onDismissRequest = onDismiss,
@@ -52,13 +52,13 @@ fun VersionActionBottomSheet(
                 add {
                     RestoreVersionModalItem(
                         title = stringResource(R.string.restore_version_bottom_sheet_item_label),
-                        onClicked = { onRestoreVersionClicked(state.versionId) },
+                        onClicked = { onRestoreVersionClicked(state.second.versionId) },
                     )
                 }
                 add {
                     DownloadVersionModalItem(
                         title = stringResource(R.string.download_version_bottom_sheet_item_label),
-                        onClicked = { onDownloadVersionClicked(state.versionId) },
+                        onClicked = { onDownloadVersionClicked(state.second.versionId, state.first) },
                     )
                 }
             }
@@ -111,10 +111,10 @@ private fun DownloadVersionModalItem(
 private fun PreviewCellsOptionsBottomSheet() {
     WireTheme {
         VersionActionBottomSheet(
-            sheetState = rememberWireModalSheetState(WireSheetValue.Expanded(value = CellVersion())),
+            sheetState = rememberWireModalSheetState(WireSheetValue.Expanded(value = "" to CellVersion())),
             onDismiss = {},
             onRestoreVersionClicked = {},
-            onDownloadVersionClicked = {}
+            onDownloadVersionClicked = { _, _ -> }
         )
     }
 }
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryNavArgs.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryNavArgs.kt
@@ -18,6 +18,6 @@
 package com.wire.android.feature.cells.ui.versioning
 
 class VersionHistoryNavArgs(
-    val uuid: String? = null,
-    val fileName: String? = null
+    val uuid: String,
+    val fileName: String
 )
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryScreen.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryScreen.kt
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryViewModel.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryViewModel.kt
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/download/DownloadState.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/download/DownloadState.kt
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/restore/RestoreNodeVersionConfirmationDialog.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/restore/RestoreNodeVersionConfirmationDialog.kt
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/restore/RestoreVersionState.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/restore/RestoreVersionState.kt
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/util/FileHelper.kt b/features/cells/src/main/java/com/wire/android/feature/cells/util/FileHelper.kt
diff --git a/features/cells/src/main/res/values/strings.xml b/features/cells/src/main/res/values/strings.xml
diff --git a/features/cells/src/test/kotlin/com/wire/android/feature/cells/ui/versioning/VersionHistoryViewModelTest.kt b/features/cells/src/test/kotlin/com/wire/android/feature/cells/ui/versioning/VersionHistoryViewModelTest.kt
diff --git a/kalium b/kalium
