feat: share a folder

ohassine · ohassine · commit 342d0a2beb8b · 2025-05-12T10:31:40.000+02:00
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/AllFilesScreen.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/AllFilesScreen.kt
@@ -67,13 +67,14 @@ fun AllFilesScreen(
         menuState = viewModel.menu,
         isAllFiles = true,
         isSearchResult = viewModel.hasSearchQuery(),
-        showPublicLinkScreen = { assetId, fileName, linkId ->
+        showPublicLinkScreen = { assetId, fileName, linkId, isFolder ->
             navigator.navigate(
                 NavigationCommand(
                     PublicLinkScreenDestination(
                         assetId = assetId,
                         fileName = fileName,
-                        publicLinkId = linkId
+                        publicLinkId = linkId,
+                        isFolder = isFolder
                     )
                 )
             )
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
@@ -64,7 +64,7 @@ internal fun CellScreenContent(
     onFolderClick: (CellNodeUi.Folder) -> Unit,
     downloadFileState: StateFlow<CellNodeUi.File?>,
     menuState: Flow<MenuOptions?>,
-    showPublicLinkScreen: (String, String, String?) -> Unit,
+    showPublicLinkScreen: (String, String, String?, Boolean) -> Unit,
     isAllFiles: Boolean,
     isSearchResult: Boolean = false,
 ) {
@@ -154,9 +154,10 @@ internal fun CellScreenContent(
                     is ShowError -> Toast.makeText(context, action.error.message, Toast.LENGTH_SHORT).show()
                     is ShowDeleteConfirmation -> deleteConfirmation = action.file
                     is ShowPublicLinkScreen -> showPublicLinkScreen(
-                        action.file.uuid,
-                        action.file.name ?: action.file.uuid,
-                        action.file.publicLinkId
+                        action.cellNode.uuid,
+                        action.cellNode.name ?: action.cellNode.uuid,
+                        action.cellNode.publicLinkId,
+                        action.cellNode is CellNodeUi.Folder
                     )
                     is RefreshData -> pagingListItems.refresh()
                 }
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellViewModel.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellViewModel.kt
@@ -286,10 +286,11 @@ class CellViewModel @Inject constructor(
         }
     }
 
-    @Suppress("UNUSED_PARAMETER")
     private fun onMenuFolderAction(folder: CellNodeUi.Folder, action: BottomSheetAction) {
         when ((action as BottomSheetAction.Folder).action) {
-            FolderAction.SHARE -> TODO()
+            FolderAction.SHARE -> {
+                sendAction(ShowPublicLinkScreen(folder))
+            }
             FolderAction.MOVE -> TODO()
             FolderAction.DOWNLOAD -> TODO()
             FolderAction.DELETE -> TODO()
@@ -354,7 +355,7 @@ sealed interface CellViewIntent {
 sealed interface CellViewAction
 internal data class ShowDeleteConfirmation(val file: CellNodeUi.File) : CellViewAction
 internal data class ShowError(val error: CellError) : CellViewAction
-internal data class ShowPublicLinkScreen(val file: CellNodeUi.File) : CellViewAction
+internal data class ShowPublicLinkScreen(val cellNode: CellNodeUi) : CellViewAction
 internal data object RefreshData : CellViewAction
 
 internal enum class CellError(val message: Int) {
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/ConversationFilesScreen.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/ConversationFilesScreen.kt
@@ -173,13 +173,14 @@ fun ConversationFilesScreenContent(
                         )
                     )
                 },
-                showPublicLinkScreen = { assetId, fileName, linkId ->
+                showPublicLinkScreen = { assetId, fileName, linkId, isFolder ->
                     navigator.navigate(
                         NavigationCommand(
                             PublicLinkScreenDestination(
                                 assetId = assetId,
                                 fileName = fileName,
-                                publicLinkId = linkId
+                                publicLinkId = linkId,
+                                isFolder = isFolder
                             )
                         )
                     )
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/dialog/FileActionsBottomSheet.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/dialog/FileActionsBottomSheet.kt
@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
@@ -50,7 +49,6 @@ import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.divider.WireDivider
 import com.wire.android.ui.common.typography
 import com.wire.android.ui.theme.WireTheme
-import kotlinx.coroutines.launch
 
 @Composable
 internal fun FileActionsBottomSheet(
@@ -60,8 +58,6 @@ internal fun FileActionsBottomSheet(
     sheetState: WireModalSheetState<Unit> = rememberWireModalSheetState<Unit>(WireSheetValue.Expanded(Unit))
 ) {
 
-    val scope = rememberCoroutineScope()
-
     WireModalSheetLayout(
         onDismissRequest = {
             onDismiss()
@@ -71,11 +67,7 @@ internal fun FileActionsBottomSheet(
         SheetContent(
             menuOptions = menuOptions,
             onAction = { action ->
-                scope.launch { sheetState.hide() }.invokeOnCompletion {
-                    if (!sheetState.isVisible) {
-                        onAction(action)
-                    }
-                }
+                onAction(action)
             }
         )
     }
@@ -165,13 +157,7 @@ private fun PreviewFileActionsBottomSheet() {
                     localPath = "",
                     userName = null,
                     conversationName = null,
-                    modifiedTime = null,
-                    remotePath = null,
-                    contentHash = null,
-                    contentUrl = null,
-                    previewUrl = null,
-                    downloadProgress = null,
-                    publicLinkId = null,
+                    modifiedTime = null
                 ),
                 actions = listOf(
                     BottomSheetAction.File(FileAction.SHARE),
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/dialog/FolderActionsBottomSheet.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/dialog/FolderActionsBottomSheet.kt
@@ -47,7 +47,6 @@ import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.divider.WireDivider
 import com.wire.android.ui.common.typography
 import com.wire.android.ui.theme.WireTheme
-import kotlinx.coroutines.launch
 
 @Composable
 internal fun FolderActionsBottomSheet(
@@ -56,7 +55,6 @@ internal fun FolderActionsBottomSheet(
     onDismiss: () -> Unit,
     sheetState: WireModalSheetState<Unit> = rememberWireModalSheetState<Unit>(WireSheetValue.Expanded(Unit))
 ) {
-    val scope = rememberCoroutineScope()
 
     WireModalSheetLayout(
         onDismissRequest = {
@@ -75,11 +73,7 @@ internal fun FolderActionsBottomSheet(
             menuOptions.actions.forEach { action ->
                 MenuItem(
                     modifier = Modifier.clickable {
-                        scope.launch { sheetState.hide() }.invokeOnCompletion {
-                            if (!sheetState.isVisible) {
-                                onAction(action)
-                            }
-                        }
+                        onAction(action)
                     },
                     action = action
                 )
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/model/CellNodeUi.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/model/CellNodeUi.kt
@@ -31,13 +31,15 @@ sealed class CellNodeUi {
     abstract val userName: String?
     abstract val conversationName: String?
     abstract val modifiedTime: String?
+    abstract val publicLinkId: String?
 
     data class Folder(
         override val name: String?,
         override val uuid: String,
         override val userName: String?,
         override val conversationName: String?,
         override val modifiedTime: String?,
+        override val publicLinkId: String? = null,
         val contents: List<CellNodeUi> // folder can has files and nested folders
     ) : CellNodeUi()
 
@@ -47,6 +49,7 @@ sealed class CellNodeUi {
         override val userName: String?,
         override val conversationName: String?,
         override val modifiedTime: String?,
+        override val publicLinkId: String? = null,
         val mimeType: String,
         val assetType: AttachmentFileType,
         val assetSize: Long?,
@@ -56,7 +59,6 @@ sealed class CellNodeUi {
         val contentUrl: String? = null,
         val previewUrl: String? = null,
         val downloadProgress: Float? = null,
-        val publicLinkId: String? = null,
     ) : CellNodeUi()
 }
 
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/publiclink/PublicLinkNavArgs.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/publiclink/PublicLinkNavArgs.kt
@@ -21,4 +21,5 @@ data class PublicLinkNavArgs(
     val assetId: String,
     val fileName: String,
     val publicLinkId: String?,
+    val isFolder: Boolean,
 )
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/publiclink/PublicLinkScreen.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/publiclink/PublicLinkScreen.kt
@@ -84,7 +84,11 @@ fun PublicLinkScreen(
         topBar = {
             WireCenterAlignedTopAppBar(
                 onNavigationPressed = { resultNavigator.navigateBack() },
-                title = stringResource(R.string.share_file_via_link),
+                title = if (viewModel.isFolder()) {
+                    stringResource(R.string.share_folder_via_link)
+                } else {
+                    stringResource(R.string.share_file_via_link)
+                },
                 navigationIconType = NavigationIconType.Close(),
                 elevation = dimensions().spacing0x
             )
@@ -95,6 +99,7 @@ fun PublicLinkScreen(
         ) {
             EnableLinkSection(
                 checked = state.enabled,
+                isFolder = viewModel.isFolder(),
                 onCheckChange = {
                     viewModel.onEnabled(it)
                 }
@@ -144,6 +149,7 @@ fun PublicLinkScreen(
 @Composable
 private fun EnableLinkSection(
     checked: Boolean,
+    isFolder: Boolean,
     onCheckChange: (Boolean) -> Unit
 ) {
     Column(
@@ -174,7 +180,11 @@ private fun EnableLinkSection(
             modifier = Modifier.height(dimensions().spacing16x)
         )
         Text(
-            text = stringResource(R.string.public_link_message),
+            text = if (isFolder) {
+                stringResource(R.string.public_link_message_folder)
+            } else {
+                stringResource(R.string.public_link_message_file)
+            },
             style = typography().body01
         )
     }
@@ -238,6 +248,7 @@ private fun PreviewCreatePublicLinkScreen() {
         Column {
             EnableLinkSection(
                 checked = true,
+                isFolder = false,
                 onCheckChange = {}
             )
             PublicLinkSection(
diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/publiclink/PublicLinkViewModel.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/publiclink/PublicLinkViewModel.kt
@@ -77,6 +77,8 @@ class PublicLinkViewModel @Inject constructor(
         }
     }
 
+    fun isFolder(): Boolean = navArgs.isFolder
+
     fun onEnabled(enabled: Boolean) {
         _state.update {
             it.copy(
diff --git a/features/cells/src/main/res/values/strings.xml b/features/cells/src/main/res/values/strings.xml
@@ -35,9 +35,11 @@
     <string name="copied_to_clipboard_message">Link copied to clipboard</string>
     <string name="file_subtitle">%1$s in %2$s</string>
     <string name="file_subtitle_modified">%1$s by %2$s</string>
-    <string name="public_link_message">Your file will be shared via a public link. Only those with the link can view it—ensure you trust your recipients.</string>
+    <string name="public_link_message_file">Your file will be shared via a public link. Only those with the link can view it—ensure you trust your recipients.</string>
+    <string name="public_link_message_folder">Your folder will be shared via a public link. Only those with the link can view it—ensure you trust your recipients.</string>
     <string name="enable_public_link">Enable public link</string>
     <string name="share_file_via_link">Share file via link</string>
+    <string name="share_folder_via_link">Share folder via link</string>
     <string name="no_app_found">No application found to open the file.</string>
     <string name="cell_files_load_failure_message">Failed to load. Please try again later.</string>
     <string name="action_failed">Action failed.</string>
diff --git a/features/cells/src/test/kotlin/com/wire/android/feature/cells/ui/CellViewModelTest.kt b/features/cells/src/test/kotlin/com/wire/android/feature/cells/ui/CellViewModelTest.kt
@@ -275,7 +275,7 @@ class CellViewModelTest {
 
             with(expectMostRecentItem()) {
                 assertTrue(this is ShowPublicLinkScreen)
-                assertEquals(testFile, (this as ShowPublicLinkScreen).file)
+                assertEquals(testFile, (this as ShowPublicLinkScreen).cellNode)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,14 @@ fun AllFilesScreen(`
`67`	`67`	`menuState = viewModel.menu,`
`68`	`68`	`isAllFiles = true,`
`69`	`69`	`isSearchResult = viewModel.hasSearchQuery(),`
`70`		`- showPublicLinkScreen = { assetId, fileName, linkId ->`
	`70`	`+ showPublicLinkScreen = { assetId, fileName, linkId, isFolder ->`
`71`	`71`	`navigator.navigate(`
`72`	`72`	`NavigationCommand(`
`73`	`73`	`PublicLinkScreenDestination(`
`74`	`74`	`assetId = assetId,`
`75`	`75`	`fileName = fileName,`
`76`		`- publicLinkId = linkId`
	`76`	`+ publicLinkId = linkId,`
	`77`	`+ isFolder = isFolder`
`77`	`78`	`)`
`78`	`79`	`)`
`79`	`80`	`)`
Original file line number	Diff line number	Diff line change
`@@ -173,13 +173,14 @@ fun ConversationFilesScreenContent(`
`173`	`173`	`)`
`174`	`174`	`)`
`175`	`175`	`},`
`176`		`- showPublicLinkScreen = { assetId, fileName, linkId ->`
	`176`	`+ showPublicLinkScreen = { assetId, fileName, linkId, isFolder ->`
`177`	`177`	`navigator.navigate(`
`178`	`178`	`NavigationCommand(`
`179`	`179`	`PublicLinkScreenDestination(`
`180`	`180`	`assetId = assetId,`
`181`	`181`	`fileName = fileName,`
`182`		`- publicLinkId = linkId`
	`182`	`+ publicLinkId = linkId,`
	`183`	`+ isFolder = isFolder`
`183`	`184`	`)`
`184`	`185`	`)`
`185`	`186`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,5 @@ data class PublicLinkNavArgs(`
`21`	`21`	`val assetId: String,`
`22`	`22`	`val fileName: String,`
`23`	`23`	`val publicLinkId: String?,`
	`24`	`+ val isFolder: Boolean,`
`24`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ class PublicLinkViewModel @Inject constructor(`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ fun isFolder(): Boolean = navArgs.isFolder`
	`81`	`+`
`80`	`82`	`fun onEnabled(enabled: Boolean) {`
`81`	`83`	`_state.update {`
`82`	`84`	`it.copy(`