Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb9fa1d3db | |||
| e59564ac07 | |||
| 0ba4fd7eb9 | |||
| 69d4257a18 | |||
| 683169e8b7 |
@@ -58,6 +58,7 @@ enum class ConflictStrategy(val label: String) {
|
|||||||
enum class DeleteBehavior(val label: String, val description: String) {
|
enum class DeleteBehavior(val label: String, val description: String) {
|
||||||
MIRROR("Mirror deletions", "Delete on target when deleted on source"),
|
MIRROR("Mirror deletions", "Delete on target when deleted on source"),
|
||||||
KEEP("Keep deleted files", "Never delete — only add/update"),
|
KEEP("Keep deleted files", "Never delete — only add/update"),
|
||||||
|
ARCHIVE("Archive deleted", "Move files deleted from phone to _Deleted/ folder on remote"),
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class ScheduleType(val label: String) {
|
enum class ScheduleType(val label: String) {
|
||||||
|
|||||||
@@ -34,16 +34,6 @@ class SyncEngine @Inject constructor(
|
|||||||
@ApplicationContext private val context: Context,
|
@ApplicationContext private val context: Context,
|
||||||
) {
|
) {
|
||||||
suspend fun sync(pair: SyncPair, provider: CloudProvider): SyncResult {
|
suspend fun sync(pair: SyncPair, provider: CloudProvider): SyncResult {
|
||||||
if (!pair.localPath.startsWith("content://")) {
|
|
||||||
val canonical = runCatching { File(pair.localPath).canonicalPath }.getOrElse { pair.localPath }
|
|
||||||
if (canonical == "/storage/emulated/0") {
|
|
||||||
val msg = "Local folder is the storage root — Android blocks writes here. Edit the pair and select a subfolder."
|
|
||||||
syncPairDao.updateSyncResult(pair.id, Instant.now(), SyncStatus.FAILED, 0)
|
|
||||||
logEvent(pair.id, SyncEventType.SYNC_FAILED, null, msg, 0)
|
|
||||||
return SyncResult(failedFiles = 1, error = Exception(msg))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
syncPairDao.updateStatus(pair.id, SyncStatus.SYNCING)
|
syncPairDao.updateStatus(pair.id, SyncStatus.SYNCING)
|
||||||
logEvent(pair.id, SyncEventType.SYNC_STARTED, null, null, 0)
|
logEvent(pair.id, SyncEventType.SYNC_STARTED, null, null, 0)
|
||||||
|
|
||||||
@@ -166,10 +156,20 @@ class SyncEngine @Inject constructor(
|
|||||||
FileOutcome(deleted = 1)
|
FileOutcome(deleted = 1)
|
||||||
}
|
}
|
||||||
SyncDecision.DELETE_REMOTE -> {
|
SyncDecision.DELETE_REMOTE -> {
|
||||||
runCatching { provider.deleteFile("${pair.remotePath}/$rel") }
|
if (pair.deleteBehavior == DeleteBehavior.ARCHIVE) {
|
||||||
.onFailure { e -> Timber.e(e, "SyncEngine: DELETE_REMOTE failed for $rel") }
|
val archivePath = "${pair.remotePath}/_Deleted/$rel"
|
||||||
fileStateDao.delete(pair.id, rel)
|
runCatching {
|
||||||
logEvent(pair.id, SyncEventType.FILE_DELETED, rel, "remote", 0)
|
ensureRemoteDirs(provider, "${pair.remotePath}/_Deleted", rel)
|
||||||
|
provider.moveFile("${pair.remotePath}/$rel", archivePath).getOrThrow()
|
||||||
|
}.onFailure { e -> Timber.e(e, "SyncEngine: ARCHIVE failed for $rel") }
|
||||||
|
fileStateDao.delete(pair.id, rel)
|
||||||
|
logEvent(pair.id, SyncEventType.FILE_DELETED, rel, "archived", 0)
|
||||||
|
} else {
|
||||||
|
runCatching { provider.deleteFile("${pair.remotePath}/$rel") }
|
||||||
|
.onFailure { e -> Timber.e(e, "SyncEngine: DELETE_REMOTE failed for $rel") }
|
||||||
|
fileStateDao.delete(pair.id, rel)
|
||||||
|
logEvent(pair.id, SyncEventType.FILE_DELETED, rel, "remote", 0)
|
||||||
|
}
|
||||||
FileOutcome(deleted = 1)
|
FileOutcome(deleted = 1)
|
||||||
}
|
}
|
||||||
SyncDecision.CONFLICT -> {
|
SyncDecision.CONFLICT -> {
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
package com.syncflow.ui.addpair
|
package com.syncflow.ui.addpair
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
import androidx.compose.animation.AnimatedVisibility
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
@@ -12,6 +15,7 @@ import androidx.compose.material3.*
|
|||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.input.ImeAction
|
import androidx.compose.ui.text.input.ImeAction
|
||||||
import androidx.compose.ui.text.input.KeyboardType
|
import androidx.compose.ui.text.input.KeyboardType
|
||||||
@@ -28,9 +32,20 @@ fun AddPairScreen(onDone: () -> Unit, vm: AddPairViewModel = hiltViewModel()) {
|
|||||||
val s by vm.state.collectAsState()
|
val s by vm.state.collectAsState()
|
||||||
LaunchedEffect(s.done) { if (s.done) onDone() }
|
LaunchedEffect(s.done) { if (s.done) onDone() }
|
||||||
|
|
||||||
|
val context = LocalContext.current
|
||||||
var showRemoteBrowser by remember { mutableStateOf(false) }
|
var showRemoteBrowser by remember { mutableStateOf(false) }
|
||||||
var showLocalBrowser by remember { mutableStateOf(false) }
|
var showLocalBrowser by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
|
val safLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
|
||||||
|
if (uri != null) {
|
||||||
|
context.contentResolver.takePersistableUriPermission(
|
||||||
|
uri,
|
||||||
|
Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION,
|
||||||
|
)
|
||||||
|
vm.update { copy(localPath = uri.toString()) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (showLocalBrowser) {
|
if (showLocalBrowser) {
|
||||||
LocalBrowserDialog(
|
LocalBrowserDialog(
|
||||||
initialPath = s.localPath.ifBlank { "" },
|
initialPath = s.localPath.ifBlank { "" },
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ import androidx.compose.ui.window.Dialog
|
|||||||
import androidx.compose.ui.window.DialogProperties
|
import androidx.compose.ui.window.DialogProperties
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.Environment
|
||||||
|
import android.provider.Settings
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
@@ -131,6 +137,10 @@ fun LocalBrowserDialog(
|
|||||||
else entries.filter { it.file.name.contains(searchQuery, ignoreCase = true) }
|
else entries.filter { it.file.name.contains(searchQuery, ignoreCase = true) }
|
||||||
|
|
||||||
val currentFolderName = currentPath.name.ifBlank { "Internal Storage" }
|
val currentFolderName = currentPath.name.ifBlank { "Internal Storage" }
|
||||||
|
val context = LocalContext.current
|
||||||
|
val hasAllFilesAccess = remember {
|
||||||
|
Build.VERSION.SDK_INT < Build.VERSION_CODES.R || Environment.isExternalStorageManager()
|
||||||
|
}
|
||||||
|
|
||||||
Dialog(
|
Dialog(
|
||||||
onDismissRequest = onDismiss,
|
onDismissRequest = onDismiss,
|
||||||
@@ -192,6 +202,35 @@ fun LocalBrowserDialog(
|
|||||||
colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface),
|
colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ── All-files-access banner ──────────────────────────────────
|
||||||
|
if (!hasAllFilesAccess) {
|
||||||
|
Surface(color = MaterialTheme.colorScheme.errorContainer) {
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
|
) {
|
||||||
|
Icon(Icons.Default.Warning, null, Modifier.size(18.dp), tint = MaterialTheme.colorScheme.onErrorContainer)
|
||||||
|
Text(
|
||||||
|
"Grant \"All files access\" to browse and sync all folders",
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
color = MaterialTheme.colorScheme.onErrorContainer,
|
||||||
|
modifier = Modifier.weight(1f),
|
||||||
|
)
|
||||||
|
TextButton(
|
||||||
|
onClick = {
|
||||||
|
val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
|
||||||
|
Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
|
||||||
|
Uri.fromParts("package", context.packageName, null))
|
||||||
|
else Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
|
||||||
|
context.startActivity(intent)
|
||||||
|
},
|
||||||
|
contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp),
|
||||||
|
) { Text("Grant", style = MaterialTheme.typography.labelSmall) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ── Breadcrumbs ──────────────────────────────────────────────
|
// ── Breadcrumbs ──────────────────────────────────────────────
|
||||||
Surface(tonalElevation = 1.dp) {
|
Surface(tonalElevation = 1.dp) {
|
||||||
LazyRow(
|
LazyRow(
|
||||||
@@ -263,23 +302,13 @@ fun LocalBrowserDialog(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ── Select button ────────────────────────────────────────────
|
// ── Select button ────────────────────────────────────────────
|
||||||
val isStorageRoot = currentPath.absolutePath == STORAGE_ROOT.absolutePath
|
|
||||||
Surface(tonalElevation = 4.dp, modifier = Modifier.fillMaxWidth()) {
|
Surface(tonalElevation = 4.dp, modifier = Modifier.fillMaxWidth()) {
|
||||||
Column {
|
Column {
|
||||||
if (isStorageRoot) {
|
|
||||||
Text(
|
|
||||||
"Android blocks writes to the storage root — please open a subfolder first",
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
color = MaterialTheme.colorScheme.error,
|
|
||||||
modifier = Modifier.padding(horizontal = 20.dp, vertical = 8.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Button(
|
Button(
|
||||||
onClick = { onSelect(currentPath.absolutePath) },
|
onClick = { onSelect(currentPath.absolutePath) },
|
||||||
enabled = !isStorageRoot,
|
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(start = 16.dp, top = 4.dp, end = 16.dp, bottom = 12.dp)
|
.padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 12.dp)
|
||||||
.height(52.dp),
|
.height(52.dp),
|
||||||
shape = RoundedCornerShape(14.dp),
|
shape = RoundedCornerShape(14.dp),
|
||||||
) {
|
) {
|
||||||
|
|||||||
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()
|
val pairs: StateFlow<List<SyncPairEntity>> = syncPairDao.observeAll()
|
||||||
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
|
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
|
||||||
|
|
||||||
|
val accounts = accountRepository.observeAll()
|
||||||
|
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
|
||||||
|
|
||||||
private val _selectedPairId = MutableStateFlow<Long?>(null)
|
private val _selectedPairId = MutableStateFlow<Long?>(null)
|
||||||
|
|
||||||
val selectedPair: StateFlow<SyncPairEntity?> = combine(_selectedPairId, pairs) { id, list ->
|
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 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 ──────────────────────────────────────────────
|
// ── Download-then-open/share ──────────────────────────────────────────────
|
||||||
|
|
||||||
private fun downloadAndOpen(file: SyncFileStateEntity) {
|
private fun downloadAndOpen(file: SyncFileStateEntity) {
|
||||||
|
|||||||
+2
-2
@@ -1,2 +1,2 @@
|
|||||||
VERSION_NAME=1.0.53
|
VERSION_NAME=1.0.58
|
||||||
VERSION_CODE=54
|
VERSION_CODE=59
|
||||||
|
|||||||
Reference in New Issue
Block a user