#496 - go back up to remotes from top level of file dialog

Author: sentinelweb

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/dialog/DefaultFileDialogInteractions.kt

@@ -47,11 +47,17 @@ class DefaultFileDialogInteractions(
             val parent = viewModel.path
                 ?.let { platformFileOperation.parent(AFile(it)) }
                 ?.path
+                ?.takeIf { it.isNotEmpty() }
+
             log.d("onUp: $parent")
-            viewModel.setPath(
-                node = null,
-                path = parent
-            )
+            if (parent != null) {
+                viewModel.setPath(
+                    node = null,
+                    path = parent
+                )
+            } else {
+                selectedNode?.also { selectedListener.invoke(it, null) }
+            }
         }
 
     companion object Factory {

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/dialog/FilesDialogComposeables.kt

@@ -55,8 +55,9 @@ object FilesDialogComposeables {
                     icon = Res.drawable.ic_up,
                     modifier = Modifier
                         .weight(0.3f)
-                        .padding(4.dp)
-                ) { viewModel.currentFolder?.playlist?.also { onUp() } }
+                        .padding(4.dp),
+                    action = { onUp() },
+                )
 
                 HeaderButton(
                     text = "OK",

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersViewModel.kt

@@ -15,6 +15,7 @@ import uk.co.sentinelweb.cuer.core.wrapper.createLogger
 import uk.co.sentinelweb.cuer.domain.*
 import uk.co.sentinelweb.cuer.domain.PlatformDomain.FILESYSTEM
 import uk.co.sentinelweb.cuer.domain.PlaylistDomain.PlaylistTypeDomain.FOLDER
+import uk.co.sentinelweb.cuer.domain.TransferDomain.AddressDomain
 import uk.co.sentinelweb.cuer.domain.TransferDomain.Status.Confirmed
 import uk.co.sentinelweb.cuer.domain.TransferDomain.Status.Initial
 import uk.co.sentinelweb.cuer.domain.ext.mapFilePath
@@ -87,19 +88,31 @@ class TransfersViewModel(
 
     private fun onSet(isSource: Boolean) {
         val copy = if (isSource)
-            { t: TransferDomain, a: TransferDomain.AddressDomain -> t.copy(source = a) }
+            { t: TransferDomain, a: AddressDomain? -> t.copy(source = a) }
         else
-            { t: TransferDomain, a: TransferDomain.AddressDomain -> t.copy(target = a) }
+            { t: TransferDomain, a: AddressDomain? -> t.copy(target = a) }
 
         val fileNodeSelected: (NodeDomain, Domain?) -> Unit = { fbNode, fbPath ->
-            val updated = _stateObservable.value.selectedTransfer
-                ?.let { copy(it, TransferDomain.AddressDomain(fbNode, fbPath)) }
-                ?.also { service.addReplaceTransfer(it) }
-
-            _stateObservable.update { last ->
-                last.copy(selectedTransfer = updated)
+            log.d("fileNodeSelected \n$fbNode \n$fbPath")
+            if (fbPath != null) {
+                val updated = _stateObservable.value.selectedTransfer
+                    ?.let { copy(it, AddressDomain(fbNode, fbPath)) }
+                    ?.also { service.addReplaceTransfer(it) }
+
+                _stateObservable.update { last ->
+                    last.copy(selectedTransfer = updated)
+                }
+                filesDialogLauncher.hideDialog()
+            } else {
+                log.d("fileNodeSelected path is null")
+                val updated = _stateObservable.value.selectedTransfer
+                    ?.let { copy(it, null) }
+                _stateObservable.updateAndGet { last ->
+                    last.copy(selectedTransfer = updated)
+                }
+                filesDialogLauncher.hideDialog()
+                onSet(isSource)
             }
-            filesDialogLauncher.hideDialog()
         }
 
         val address = _stateObservable.value.selectedTransfer
@@ -108,7 +121,7 @@ class TransfersViewModel(
     }
 
     private fun showDialog(
-        address: TransferDomain.AddressDomain?,
+        address: AddressDomain?,
         fileSelected: (NodeDomain, Domain?) -> Unit
     ) {
         val path = address?.path