Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb9fa1d3db | |||
| e59564ac07 |
@@ -120,8 +120,7 @@ fun AddPairScreen(onDone: () -> Unit, vm: AddPairViewModel = hiltViewModel()) {
|
||||
|
||||
Spacer(Modifier.height(4.dp))
|
||||
|
||||
// Local folder — tap opens Android system picker (SAF), same as Autosync
|
||||
Column {
|
||||
// Local folder
|
||||
Box(modifier = Modifier.fillMaxWidth()) {
|
||||
OutlinedTextField(
|
||||
value = uriToDisplay(s.localPath), onValueChange = {},
|
||||
@@ -131,15 +130,7 @@ fun AddPairScreen(onDone: () -> Unit, vm: AddPairViewModel = hiltViewModel()) {
|
||||
readOnly = true, singleLine = true, modifier = Modifier.fillMaxWidth(),
|
||||
placeholder = { Text("Tap to choose folder…") },
|
||||
)
|
||||
Box(modifier = Modifier.matchParentSize().clickable { safLauncher.launch(null) })
|
||||
}
|
||||
TextButton(
|
||||
onClick = { showLocalBrowser = true },
|
||||
modifier = Modifier.align(Alignment.End),
|
||||
contentPadding = PaddingValues(horizontal = 8.dp, vertical = 0.dp),
|
||||
) {
|
||||
Text("Browse manually", style = MaterialTheme.typography.labelSmall)
|
||||
}
|
||||
Box(modifier = Modifier.matchParentSize().clickable { showLocalBrowser = true })
|
||||
}
|
||||
|
||||
// Remote folder
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -40,6 +40,9 @@ class FilesViewModel @Inject constructor(
|
||||
val pairs: StateFlow<List<SyncPairEntity>> = syncPairDao.observeAll()
|
||||
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
|
||||
|
||||
val accounts = accountRepository.observeAll()
|
||||
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
|
||||
|
||||
private val _selectedPairId = MutableStateFlow<Long?>(null)
|
||||
|
||||
val selectedPair: StateFlow<SyncPairEntity?> = combine(_selectedPairId, pairs) { id, list ->
|
||||
@@ -158,6 +161,31 @@ class FilesViewModel @Inject constructor(
|
||||
|
||||
fun fileKey(file: SyncFileStateEntity) = "${file.syncPairId}:${file.relativePath}"
|
||||
|
||||
fun openCloudFile(accountId: Long, remotePath: String) {
|
||||
viewModelScope.launch {
|
||||
val account = accountRepository.getAccount(accountId) ?: run {
|
||||
_fileAction.emit(FileAction.Error("Account not found"))
|
||||
return@launch
|
||||
}
|
||||
val provider = providerFactory.create(account)
|
||||
val fileName = remotePath.substringAfterLast('/')
|
||||
val cacheFile = File(context.cacheDir, "syncflow_open/$fileName")
|
||||
cacheFile.parentFile?.mkdirs()
|
||||
_isDownloading.value = true
|
||||
try {
|
||||
cacheFile.outputStream().use { out ->
|
||||
provider.downloadFile(remotePath, out) { }.getOrThrow()
|
||||
}
|
||||
_fileAction.emit(FileAction.Open(cacheFile))
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, "Cloud open failed: $remotePath")
|
||||
_fileAction.emit(FileAction.Error("Cannot open: ${e.message}"))
|
||||
} finally {
|
||||
_isDownloading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── Download-then-open/share ──────────────────────────────────────────────
|
||||
|
||||
private fun downloadAndOpen(file: SyncFileStateEntity) {
|
||||
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
VERSION_NAME=1.0.56
|
||||
VERSION_CODE=57
|
||||
VERSION_NAME=1.0.58
|
||||
VERSION_CODE=59
|
||||
|
||||
Reference in New Issue
Block a user