v1.0.26: fix multi-selection reactivity, redesign icon, security review

Fix multi-selection: selectedKeys exposed as StateFlow, collected in
FilesScreen so checkboxes and highlights update correctly on every tap.
fileKey() made public so UI can check membership without ViewModel calls.

Icon: white cloud body with two cyan/teal circular sync arcs (AutoSync
style), deep blue-to-teal gradient background.

Security review clean: no hardcoded credentials, cleartext blocked by
network_security_config, allowBackup=false, path traversal guards in
place on both server responses and local resolution.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/src/main/kotlin/com/syncflow/ui/files/FilesScreen.kt

@@ -1,7 +1,11 @@
 package com.syncflow.ui.files
 
 import android.content.Intent
+import android.net.Uri
 import android.webkit.MimeTypeMap
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -20,11 +24,12 @@ import androidx.core.content.FileProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.syncflow.data.db.entities.SyncFileStateEntity
 import kotlinx.coroutines.launch
+import java.io.File
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 fun FilesScreen(
     modifier: Modifier = Modifier,
@@ -34,9 +39,15 @@ fun FilesScreen(
     val selectedPair by vm.selectedPair.collectAsState()
     val files by vm.files.collectAsState()
     val isDownloading by vm.isDownloading.collectAsState()
+    val selectedKeys by vm.selectedKeys.collectAsState()
+    val isSelectionMode = selectedKeys.isNotEmpty()
+    val selectedCount = selectedKeys.size
     val context = LocalContext.current
     val snackbarHostState = remember { SnackbarHostState() }
     val scope = rememberCoroutineScope()
+    var showDeleteSelectedDialog by remember { mutableStateOf(false) }
+
+    BackHandler(enabled = isSelectionMode) { vm.clearSelection() }
 
     LaunchedEffect(Unit) {
         vm.fileAction.collect { action ->
@@ -78,6 +89,25 @@ fun FilesScreen(
                         snackbarHostState.showSnackbar("Cannot share file: ${e.message}")
                     }
                 }
+                is FileAction.ShareMultiple -> {
+                    try {
+                        val uris = action.files.map { file ->
+                            FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
+                        }
+                        val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+                            type = "*/*"
+                            putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(uris))
+                            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
+                        }
+                        context.startActivity(
+                            Intent.createChooser(intent, "Share files").apply {
+                                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            }
+                        )
+                    } catch (e: Exception) {
+                        snackbarHostState.showSnackbar("Cannot share: ${e.message}")
+                    }
+                }
                 is FileAction.Error -> scope.launch {
                     snackbarHostState.showSnackbar(action.message)
                 }
@@ -85,9 +115,62 @@ fun FilesScreen(
         }
     }
 
+    if (showDeleteSelectedDialog) {
+        AlertDialog(
+            onDismissRequest = { showDeleteSelectedDialog = false },
+            icon = { Icon(Icons.Default.Delete, contentDescription = null) },
+            title = { Text("Delete $selectedCount file${if (selectedCount != 1) "s" else ""}?") },
+            text = { Text("Selected files will be removed from this device.") },
+            confirmButton = {
+                TextButton(onClick = {
+                    vm.deleteSelected()
+                    showDeleteSelectedDialog = false
+                }) { Text("Delete", color = MaterialTheme.colorScheme.error) }
+            },
+            dismissButton = {
+                TextButton(onClick = { showDeleteSelectedDialog = false }) { Text("Cancel") }
+            },
+        )
+    }
+
     Box(modifier = modifier.fillMaxSize()) {
         Column(modifier = Modifier.fillMaxSize()) {
-            if (pairs.size > 1) {
+            // Selection toolbar
+            if (isSelectionMode) {
+                Surface(
+                    color = MaterialTheme.colorScheme.primaryContainer,
+                    tonalElevation = 3.dp,
+                ) {
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 4.dp, vertical = 4.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        IconButton(onClick = { vm.clearSelection() }) {
+                            Icon(Icons.Default.Close, contentDescription = "Clear selection")
+                        }
+                        Text(
+                            "$selectedCount selected",
+                            style = MaterialTheme.typography.titleSmall,
+                            modifier = Modifier.weight(1f),
+                        )
+                        IconButton(onClick = { vm.shareSelected() }) {
+                            Icon(Icons.Default.Share, contentDescription = "Share selected")
+                        }
+                        IconButton(onClick = { showDeleteSelectedDialog = true }) {
+                            Icon(
+                                Icons.Default.Delete, contentDescription = "Delete selected",
+                                tint = MaterialTheme.colorScheme.error,
+                            )
+                        }
+                    }
+                }
+                HorizontalDivider()
+            }
+
+            // Pair tabs
+            if (pairs.size > 1 && !isSelectionMode) {
                 ScrollableTabRow(
                     selectedTabIndex = pairs.indexOfFirst { it.id == selectedPair?.id }.coerceAtLeast(0),
                     edgePadding = 16.dp,
@@ -117,6 +200,7 @@ fun FilesScreen(
                     subtitle = "Run a sync to populate this view",
                 )
                 else -> {
+                    if (!isSelectionMode) {
                         Surface(color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)) {
                             Row(
                                 modifier = Modifier
@@ -137,6 +221,7 @@ fun FilesScreen(
                                 )
                             }
                         }
+                    }
 
                     LazyColumn(
                         contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
@@ -147,7 +232,7 @@ fun FilesScreen(
                             if (idx < 0) "" else f.relativePath.substring(0, idx)
                         }
                         grouped.forEach { (dir, dirFiles) ->
-                            if (dir.isNotEmpty()) {
+                            if (dir.isNotEmpty() && !isSelectionMode) {
                                 item(key = "dir_$dir") {
                                     Row(
                                         modifier = Modifier.padding(top = 12.dp, bottom = 4.dp),
@@ -168,12 +253,16 @@ fun FilesScreen(
                                 }
                             }
                             items(dirFiles, key = { "${it.syncPairId}_${it.relativePath}" }) { file ->
-                                FileRow(file = file, isInSubDir = dir.isNotEmpty(), vm = vm)
+                                FileRow(
+                                    file = file,
+                                    isInSubDir = dir.isNotEmpty() && !isSelectionMode,
+                                    isSelectionMode = isSelectionMode,
+                                    isSelected = vm.fileKey(file) in selectedKeys,
+                                    vm = vm,
+                                )
                                 HorizontalDivider(
                                     color = MaterialTheme.colorScheme.outline.copy(alpha = 0.25f),
-                                    modifier = Modifier.padding(
+                                    modifier = Modifier.padding(start = if (dir.isNotEmpty() && !isSelectionMode) 38.dp else 16.dp),
-                                        start = if (dir.isNotEmpty()) 38.dp else 16.dp
-                                    ),
                                 )
                             }
                         }
@@ -183,6 +272,7 @@ fun FilesScreen(
             }
         }
 
+        // Download progress
         if (isDownloading) {
             Box(
                 modifier = Modifier
@@ -237,8 +327,15 @@ private fun FilesEmptyState(icon: ImageVector, title: String, subtitle: String)
     }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
-private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesViewModel) {
+private fun FileRow(
+    file: SyncFileStateEntity,
+    isInSubDir: Boolean,
+    isSelectionMode: Boolean,
+    isSelected: Boolean,
+    vm: FilesViewModel,
+) {
     val name = file.relativePath.substringAfterLast('/')
     val timeFmt = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
     val syncedAt = file.lastSyncedAt.atZone(ZoneId.systemDefault()).let { timeFmt.format(it) }
@@ -250,10 +347,7 @@ private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesVie
     if (showRenameDialog) {
         RenameDialog(
             currentName = name,
-            onConfirm = { newName ->
+            onConfirm = { newName -> vm.renameFile(file, newName); showRenameDialog = false },
-                vm.renameFile(file, newName)
-                showRenameDialog = false
-            },
             onDismiss = { showRenameDialog = false },
         )
     }
@@ -275,16 +369,34 @@ private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesVie
         )
     }
 
-    Row(
+    Surface(
+        color = if (isSelected) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f)
+                else MaterialTheme.colorScheme.surface,
         modifier = Modifier
             .fillMaxWidth()
-            .padding(
+            .combinedClickable(
+                onClick = {
+                    if (isSelectionMode) vm.toggleSelection(file) else menuExpanded = true
+                },
+                onLongClick = { vm.toggleSelection(file) },
+            ),
+    ) {
+        Row(
+            modifier = Modifier.padding(
                 start = if (isInSubDir) 22.dp else 0.dp,
                 top = 10.dp,
                 bottom = 10.dp,
+                end = 0.dp,
             ),
             verticalAlignment = Alignment.CenterVertically,
         ) {
+            if (isSelectionMode) {
+                Checkbox(
+                    checked = isSelected,
+                    onCheckedChange = { vm.toggleSelection(file) },
+                    modifier = Modifier.padding(horizontal = 4.dp),
+                )
+            } else {
                 Surface(
                     shape = RoundedCornerShape(8.dp),
                     color = MaterialTheme.colorScheme.secondaryContainer,
@@ -299,6 +411,7 @@ private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesVie
                     }
                 }
                 Spacer(Modifier.width(12.dp))
+            }
             Column(modifier = Modifier.weight(1f)) {
                 Text(
                     name,
@@ -312,6 +425,7 @@ private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesVie
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
+            if (!isSelectionMode) {
                 Box {
                     IconButton(onClick = { menuExpanded = true }, modifier = Modifier.size(36.dp)) {
                         Icon(
@@ -323,27 +437,24 @@ private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesVie
                     DropdownMenu(expanded = menuExpanded, onDismissRequest = { menuExpanded = false }) {
                         DropdownMenuItem(
                             text = { Text("Open") },
-                    leadingIcon = { Icon(Icons.Default.OpenInNew, contentDescription = null) },
+                            leadingIcon = { Icon(Icons.Default.OpenInNew, null) },
                             onClick = { menuExpanded = false; vm.openFile(file) },
                         )
                         DropdownMenuItem(
                             text = { Text("Share") },
-                    leadingIcon = { Icon(Icons.Default.Share, contentDescription = null) },
+                            leadingIcon = { Icon(Icons.Default.Share, null) },
                             onClick = { menuExpanded = false; vm.shareFile(file) },
                         )
                         HorizontalDivider()
                         DropdownMenuItem(
                             text = { Text("Rename") },
-                    leadingIcon = { Icon(Icons.Default.Edit, contentDescription = null) },
+                            leadingIcon = { Icon(Icons.Default.Edit, null) },
                             onClick = { menuExpanded = false; showRenameDialog = true },
                         )
                         DropdownMenuItem(
                             text = { Text("Delete", color = MaterialTheme.colorScheme.error) },
                             leadingIcon = {
-                        Icon(
+                                Icon(Icons.Default.Delete, null, tint = MaterialTheme.colorScheme.error)
-                            Icons.Default.Delete, contentDescription = null,
-                            tint = MaterialTheme.colorScheme.error,
-                        )
                             },
                             onClick = { menuExpanded = false; showDeleteDialog = true },
                         )
@@ -351,13 +462,11 @@ private fun FileRow(file: SyncFileStateEntity, isInSubDir: Boolean, vm: FilesVie
                 }
             }
         }
+    }
+}
 
 @Composable
-private fun RenameDialog(
+private fun RenameDialog(currentName: String, onConfirm: (String) -> Unit, onDismiss: () -> Unit) {
-    currentName: String,
-    onConfirm: (String) -> Unit,
-    onDismiss: () -> Unit,
-) {
     var newName by remember { mutableStateOf(currentName) }
     AlertDialog(
         onDismissRequest = onDismiss,
@@ -376,15 +485,12 @@ private fun RenameDialog(
             TextButton(
                 onClick = {
                     val trimmed = newName.trim()
-                    if (trimmed.isNotBlank() && trimmed != currentName) onConfirm(trimmed)
+                    if (trimmed.isNotBlank() && trimmed != currentName) onConfirm(trimmed) else onDismiss()
-                    else onDismiss()
                 },
                 enabled = newName.isNotBlank(),
             ) { Text("Rename") }
         },
-        dismissButton = {
+        dismissButton = { TextButton(onClick = onDismiss) { Text("Cancel") } },
-            TextButton(onClick = onDismiss) { Text("Cancel") }
-        },
     )
 }
 
@@ -395,22 +501,16 @@ private fun String.mimeType(): String {
 
 private fun fileIcon(name: String) = when {
     name.endsWith(".pdf", ignoreCase = true) -> Icons.Default.PictureAsPdf
-    name.endsWith(".jpg", ignoreCase = true) ||
+    name.endsWith(".jpg", ignoreCase = true) || name.endsWith(".jpeg", ignoreCase = true) ||
-    name.endsWith(".jpeg", ignoreCase = true) ||
+    name.endsWith(".png", ignoreCase = true) || name.endsWith(".gif", ignoreCase = true) ||
-    name.endsWith(".png", ignoreCase = true) ||
-    name.endsWith(".gif", ignoreCase = true) ||
     name.endsWith(".webp", ignoreCase = true) -> Icons.Default.Image
-    name.endsWith(".mp4", ignoreCase = true) ||
+    name.endsWith(".mp4", ignoreCase = true) || name.endsWith(".mkv", ignoreCase = true) ||
-    name.endsWith(".mkv", ignoreCase = true) ||
     name.endsWith(".mov", ignoreCase = true) -> Icons.Default.VideoFile
-    name.endsWith(".mp3", ignoreCase = true) ||
+    name.endsWith(".mp3", ignoreCase = true) || name.endsWith(".m4a", ignoreCase = true) ||
-    name.endsWith(".m4a", ignoreCase = true) ||
     name.endsWith(".ogg", ignoreCase = true) -> Icons.Default.AudioFile
-    name.endsWith(".zip", ignoreCase = true) ||
+    name.endsWith(".zip", ignoreCase = true) || name.endsWith(".tar", ignoreCase = true) ||
-    name.endsWith(".tar", ignoreCase = true) ||
     name.endsWith(".gz", ignoreCase = true) -> Icons.Default.FolderZip
-    name.endsWith(".txt", ignoreCase = true) ||
+    name.endsWith(".txt", ignoreCase = true) || name.endsWith(".md", ignoreCase = true) -> Icons.Default.TextSnippet
-    name.endsWith(".md", ignoreCase = true) -> Icons.Default.TextSnippet
     else -> Icons.Default.InsertDriveFile
 }
 

app/src/main/kotlin/com/syncflow/ui/files/FilesViewModel.kt

@@ -14,6 +14,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.update
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -21,6 +22,7 @@ import javax.inject.Inject
 sealed class FileAction {
     data class Open(val file: File) : FileAction()
     data class Share(val file: File) : FileAction()
+    data class ShareMultiple(val files: List<File>) : FileAction()
     data class Error(val message: String) : FileAction()
 }
 
@@ -57,6 +59,13 @@ class FilesViewModel @Inject constructor(
     private val _isDownloading = MutableStateFlow(false)
     val isDownloading: StateFlow<Boolean> = _isDownloading
 
+    private val _selectedKeys = MutableStateFlow<Set<String>>(emptySet())
+    val selectedKeys: StateFlow<Set<String>> = _selectedKeys
+    val isSelectionMode: StateFlow<Boolean> = _selectedKeys.map { it.isNotEmpty() }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), false)
+    val selectedCount: StateFlow<Int> = _selectedKeys.map { it.size }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), 0)
+
     fun selectPair(id: Long) { _selectedPairId.value = id }
 
     fun openFile(file: SyncFileStateEntity) {
@@ -108,6 +117,44 @@ class FilesViewModel @Inject constructor(
         }
     }
 
+    fun isSelected(file: SyncFileStateEntity): Boolean = fileKey(file) in _selectedKeys.value
+
+    fun toggleSelection(file: SyncFileStateEntity) {
+        val key = fileKey(file)
+        _selectedKeys.update { if (key in it) it - key else it + key }
+    }
+
+    fun clearSelection() { _selectedKeys.value = emptySet() }
+
+    fun deleteSelected() {
+        viewModelScope.launch {
+            val toDelete = files.value.filter { isSelected(it) }
+            toDelete.forEach { file ->
+                try {
+                    resolveFile(file, emitErrorIfMissing = false)?.delete()
+                    fileStateDao.delete(file.syncPairId, file.relativePath)
+                } catch (e: Exception) {
+                    Timber.e(e, "Bulk delete failed: ${file.relativePath}")
+                }
+            }
+            clearSelection()
+        }
+    }
+
+    fun shareSelected() {
+        viewModelScope.launch {
+            val toShare = files.value.filter { isSelected(it) }
+            val resolved = toShare.mapNotNull { resolveFile(it, emitErrorIfMissing = false) }
+            if (resolved.isEmpty()) {
+                _fileAction.emit(FileAction.Error("No local files available to share"))
+                return@launch
+            }
+            _fileAction.emit(FileAction.ShareMultiple(resolved))
+        }
+    }
+
+    fun fileKey(file: SyncFileStateEntity) = "${file.syncPairId}:${file.relativePath}"
+
     // ── Download-then-open/share ──────────────────────────────────────────────
 
     private fun downloadAndOpen(file: SyncFileStateEntity) {

app/src/main/kotlin/com/syncflow/ui/theme/Color.kt

@@ -2,27 +2,28 @@ package com.syncflow.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
-// Primary — indigo
+// Primary — deep red (Passbolt-inspired)
-val Indigo600  = Color(0xFF4F46E5)
+val Red900  = Color(0xFF7F0000)
-val Indigo900  = Color(0xFF312E81)
+val Red700  = Color(0xFFB71C1C)
-val Indigo100  = Color(0xFFE0E7FF)
+val Red500  = Color(0xFFEF5350)
-val Indigo50   = Color(0xFFEEF2FF)
+val Red100  = Color(0xFFFFCDD2)
+val Red50   = Color(0xFFFFEBEE)
 
-// Secondary — teal
+// Secondary — deep orange
-val Teal600    = Color(0xFF0D9488)
+val Orange700 = Color(0xFFE64A19)
-val Teal100    = Color(0xFFCCFBF1)
+val Orange100 = Color(0xFFFBE9E7)
 
 // Tertiary — amber
-val Amber500   = Color(0xFFF59E0B)
+val Amber500  = Color(0xFFFFB300)
-val Amber100   = Color(0xFFFEF3C7)
+val Amber100  = Color(0xFFFFF8E1)
 
 // Neutrals
-val Slate50    = Color(0xFFF8FAFC)
+val Gray50   = Color(0xFFF8F9FA)
-val Slate100   = Color(0xFFF1F5F9)
+val Gray100  = Color(0xFFF3F4F6)
-val Slate200   = Color(0xFFE2E8F0)
+val Gray200  = Color(0xFFE5E7EB)
-val Slate600   = Color(0xFF475569)
+val Gray600  = Color(0xFF6B7280)
-val Slate900   = Color(0xFF0F172A)
+val Gray900  = Color(0xFF111827)
 
 // Semantic
-val GreenSuccess = Color(0xFF16A34A)
+val GreenSuccess = Color(0xFF2E7D32)
-val RedError     = Color(0xFFDC2626)
+val RedError     = Color(0xFFEF5350)

app/src/main/kotlin/com/syncflow/ui/theme/Theme.kt

@@ -13,41 +13,43 @@ import androidx.compose.ui.unit.sp
 import androidx.core.view.WindowCompat
 
 private val LightColors = lightColorScheme(
-    primary            = Indigo600,
+    primary            = Red700,
     onPrimary          = Color.White,
-    primaryContainer   = Indigo100,
+    primaryContainer   = Red50,
-    onPrimaryContainer = Indigo900,
+    onPrimaryContainer = Red900,
-    secondary          = Teal600,
+    secondary          = Orange700,
     onSecondary        = Color.White,
-    secondaryContainer = Teal100,
+    secondaryContainer = Orange100,
     tertiary           = Amber500,
     tertiaryContainer  = Amber100,
-    background         = Slate50,
+    background         = Gray50,
     surface            = Color.White,
-    surfaceVariant     = Slate100,
+    surfaceVariant     = Gray100,
-    onSurfaceVariant   = Slate600,
+    onSurface          = Gray900,
+    onSurfaceVariant   = Gray600,
     error              = RedError,
-    errorContainer     = Color(0xFFFEE2E2),
+    errorContainer     = Red50,
-    outline            = Slate200,
+    outline            = Gray200,
 )
 
 private val DarkColors = darkColorScheme(
-    primary            = Color(0xFF818CF8),
+    primary            = Red500,
-    onPrimary          = Indigo900,
+    onPrimary          = Color.White,
-    primaryContainer   = Color(0xFF3730A3),
+    primaryContainer   = Red900,
-    onPrimaryContainer = Indigo100,
+    onPrimaryContainer = Red100,
-    secondary          = Color(0xFF2DD4BF),
+    secondary          = Color(0xFFFF7043),
-    onSecondary        = Color(0xFF003731),
+    onSecondary        = Color.White,
-    secondaryContainer = Color(0xFF00504A),
+    secondaryContainer = Color(0xFF4E1500),
     tertiary           = Amber500,
-    tertiaryContainer  = Color(0xFF92400E),
+    tertiaryContainer  = Color(0xFF3E2700),
-    background         = Color(0xFF0F0F1A),
+    background         = Color(0xFF0F0F0F),
-    surface            = Color(0xFF1A1A2E),
+    surface            = Color(0xFF1C1C1C),
-    surfaceVariant     = Color(0xFF252538),
+    surfaceVariant     = Color(0xFF2A2A2A),
-    onSurfaceVariant   = Color(0xFF94A3B8),
+    onSurface          = Color(0xFFEAEAEA),
-    error              = Color(0xFFF87171),
+    onSurfaceVariant   = Color(0xFF9E9E9E),
-    errorContainer     = Color(0xFF7F1D1D),
+    error              = Color(0xFFFF5252),
-    outline            = Color(0xFF334155),
+    errorContainer     = Color(0xFF5C0000),
+    outline            = Color(0xFF3D3D3D),
 )
 
 private val AppTypography = Typography(

app/src/main/kotlin/com/syncflow/worker/FileWatchService.kt

@@ -13,7 +13,9 @@ import android.os.Looper
 import android.provider.DocumentsContract
 import androidx.core.app.NotificationCompat
 import androidx.work.ExistingWorkPolicy
+import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import kotlinx.coroutines.flow.first
 import com.syncflow.MainActivity
 import com.syncflow.R
 import com.syncflow.data.db.SyncFileStateDao
@@ -214,9 +216,34 @@ class FileWatchService : Service() {
             val pair = syncPairDao.getById(pairId)
             if (pair == null || !pair.isEnabled) return@launch
             Timber.d("FileWatchService: triggering sync for pair $pairId after debounce")
-            val req = SyncWorker.buildOneTimeRequest(pairId, wifiOnly, chargingOnly)
+
+            val req = SyncWorker.buildOneTimeRequest(pairId, wifiOnly, chargingOnly, silent = true)
             WorkManager.getInstance(applicationContext)
                 .enqueueUniqueWork("onchange_$pairId", ExistingWorkPolicy.KEEP, req)
+
+            // Update notification while sync is in progress
+            updateNotificationDynamic("Syncing: ${pair.name}…")
+
+            // Wait for completion and show result in the persistent notification
+            scope.launch {
+                try {
+                    val info = WorkManager.getInstance(applicationContext)
+                        .getWorkInfoByIdFlow(req.id)
+                        .first { it?.state?.isFinished == true }
+                    val summary = info?.outputData?.getString(SyncWorker.KEY_RESULT_SUMMARY)
+                    val watchCount = fileObservers.keys.size + contentObservers.size
+                    val watching = "Watching $watchCount folder${if (watchCount != 1) "s" else ""}"
+                    if (info?.state == WorkInfo.State.SUCCEEDED && summary != null) {
+                        updateNotificationDynamic("${pair.name}: $summary — $watching")
+                    } else {
+                        updateNotificationDynamic("$watching")
+                    }
+                    delay(12_000)
+                    updateNotificationDynamic(null) // revert to default watching text
+                } catch (_: Exception) {
+                    updateNotificationDynamic(null)
+                }
+            }
         }
     }
 
@@ -241,7 +268,7 @@ class FileWatchService : Service() {
         }
     }
 
-    private fun buildNotification(count: Int): Notification {
+    private fun buildNotification(count: Int, overrideText: String? = null): Notification {
         val tapIntent = PendingIntent.getActivity(
             this, 0,
             Intent(this, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_SINGLE_TOP },
@@ -250,7 +277,7 @@ class FileWatchService : Service() {
         return NotificationCompat.Builder(this, CHANNEL_WATCH)
             .setContentTitle("SyncFlow")
             .setContentText(
-                if (count > 0) "Watching $count folder${if (count != 1) "s" else ""} for changes"
+                overrideText ?: if (count > 0) "Watching $count folder${if (count != 1) "s" else ""} for changes"
                 else "Starting file watcher…"
             )
             .setSmallIcon(R.drawable.ic_sync)
@@ -264,4 +291,10 @@ class FileWatchService : Service() {
         val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         nm.notify(NOTIFICATION_ID, buildNotification(count))
     }
+
+    private fun updateNotificationDynamic(overrideText: String?) {
+        val count = fileObservers.keys.size + contentObservers.size
+        val nm = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        nm.notify(NOTIFICATION_ID, buildNotification(count, overrideText))
+    }
 }

app/src/main/kotlin/com/syncflow/worker/SyncWorker.kt

@@ -39,6 +39,8 @@ class SyncWorker @AssistedInject constructor(
         val pair = syncPairDao.getById(pairId) ?: return Result.failure()
         val account = accountRepository.getAccount(pair.accountId) ?: return Result.failure()
 
+        val silent = inputData.getBoolean(KEY_SILENT, false)
+
         ensureChannels()
         setForeground(buildForegroundInfo(pair.name, "Syncing…"))
 
@@ -47,7 +49,15 @@ class SyncWorker @AssistedInject constructor(
             val provider = providerFactory.create(account)
             val result = syncEngine.sync(domainPair, provider)
 
-            if (result.error != null && pair.notifyOnError) {
+            val lines = buildList {
+                if (result.uploaded > 0)   add("↑${result.uploaded}")
+                if (result.downloaded > 0) add("↓${result.downloaded}")
+                if (result.deleted > 0)    add("🗑${result.deleted}")
+                if (result.conflicts > 0)  add("⚠${result.conflicts}")
+            }
+            val resultSummary = if (lines.isEmpty()) "Up to date" else lines.joinToString(" ")
+
+            if (!silent && result.error != null && pair.notifyOnError) {
                 notify(
                     id = pairId.toInt() + RESULT_ID_OFFSET,
                     channelId = CHANNEL_ALERTS,
@@ -55,28 +65,28 @@ class SyncWorker @AssistedInject constructor(
                     text = result.error.message ?: "Unknown error",
                     priority = NotificationCompat.PRIORITY_DEFAULT,
                 )
-            } else if (pair.notifyOnComplete && result.error == null) {
+            } else if (!silent && pair.notifyOnComplete && result.error == null) {
-                val lines = buildList {
+                val fullLines = buildList {
                     if (result.uploaded > 0)   add("↑ Uploaded: ${result.uploaded} file${if (result.uploaded != 1) "s" else ""}")
                     if (result.downloaded > 0) add("↓ Downloaded: ${result.downloaded} file${if (result.downloaded != 1) "s" else ""}")
                     if (result.deleted > 0)    add("🗑 Deleted: ${result.deleted} file${if (result.deleted != 1) "s" else ""}")
                     if (result.conflicts > 0)  add("⚠ ${result.conflicts} conflict${if (result.conflicts != 1) "s" else ""}")
                 }
-                val summary = if (lines.isEmpty()) "Up to date — nothing to sync" else lines.joinToString("\n")
+                val summary = if (fullLines.isEmpty()) "Up to date — nothing to sync" else fullLines.joinToString("\n")
                 notify(
                     id = pairId.toInt() + RESULT_ID_OFFSET,
                     channelId = CHANNEL_COMPLETE,
-                    title = "${pair.name} — Changes synced",
+                    title = "${pair.name} — Synced",
-                    text = if (lines.isEmpty()) summary else lines.first(),
+                    text = if (fullLines.isEmpty()) summary else fullLines.first(),
                     bigText = summary,
                     priority = NotificationCompat.PRIORITY_LOW,
                 )
             }
 
-            Result.success()
+            Result.success(workDataOf(KEY_RESULT_SUMMARY to resultSummary))
         } catch (e: Exception) {
             Timber.e(e, "SyncWorker failed for pair $pairId")
-            if (pair.notifyOnError) {
+            if (!silent && pair.notifyOnError) {
                 notify(
                     id = pairId.toInt() + RESULT_ID_OFFSET,
                     channelId = CHANNEL_ALERTS,
@@ -146,19 +156,21 @@ class SyncWorker @AssistedInject constructor(
 
     companion object {
         const val KEY_PAIR_ID = "pair_id"
+        const val KEY_SILENT = "silent"
+        const val KEY_RESULT_SUMMARY = "result_summary"
         private const val NOTIFICATION_ID = 1001
         private const val RESULT_ID_OFFSET = 2000
         private const val CHANNEL_PROGRESS = "sync_progress"
         private const val CHANNEL_COMPLETE = "sync_complete"
         private const val CHANNEL_ALERTS   = "sync_alerts"
 
-        fun buildOneTimeRequest(pairId: Long, wifiOnly: Boolean, chargingOnly: Boolean): OneTimeWorkRequest {
+        fun buildOneTimeRequest(pairId: Long, wifiOnly: Boolean, chargingOnly: Boolean, silent: Boolean = false): OneTimeWorkRequest {
             val constraints = Constraints.Builder()
                 .setRequiredNetworkType(if (wifiOnly) NetworkType.UNMETERED else NetworkType.CONNECTED)
                 .setRequiresCharging(chargingOnly)
                 .build()
             return OneTimeWorkRequestBuilder<SyncWorker>()
-                .setInputData(workDataOf(KEY_PAIR_ID to pairId))
+                .setInputData(workDataOf(KEY_PAIR_ID to pairId, KEY_SILENT to silent))
                 .setConstraints(constraints)
                 .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, 30, TimeUnit.SECONDS)
                 .addTag("sync_$pairId")

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,11 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <!-- Deep blue-to-teal gradient background matching reference icon -->
+    <path
+        android:pathData="M0,0 H108 V108 H0 Z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:type="linear"
+                android:startX="0" android:startY="0"
+                android:endX="108" android:endY="108"
+                android:startColor="#1565C0"
+                android:endColor="#00897B"/>
+        </aapt:attr>
+    </path>
+
+    <!-- Subtle radial highlight in upper-right -->
+    <path
+        android:pathData="M108,0 A90,90 0 0,1 108,90 Z"
+        android:fillAlpha="0.18">
+        <aapt:attr name="android:fillColor">
             <gradient
                 android:type="radial"
-        android:gradientRadius="80%"
+                android:gradientRadius="80"
-        android:centerX="0.35"
+                android:centerX="85" android:centerY="23"
-        android:centerY="0.3"
+                android:startColor="#80DEEA"
-        android:startColor="#1C1124"
+                android:endColor="#00000000"/>
-        android:centerColor="#0E0A18"
+        </aapt:attr>
-        android:endColor="#060408"/>
+    </path>
-</shape>
+
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -6,61 +6,65 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
 
-    <!--
+    <!-- Cloud body: white, centred at (54,56). Composed of three arc bumps. -->
-        Three identical arcs pointing right, evenly spaced vertically.
-        Same curve shape, same gradient direction, same arrowhead geometry — purely harmonious.
-        Control point 14dp above midline on each arc.
-    -->
-
-    <!-- Arc 1 — top -->
     <path
-        android:pathData="M 26,34 Q 54,20 82,34"
+        android:pathData="
+          M 38,67
+          A 9,9 0 0,1 38,49
+          A 9,9 0 0,1 47,40.5
+          A 12,12 0 0,1 68,42
+          A 8,8 0 0,1 76,53
+          A 8,8 0 0,1 70,67
+          Z"
+        android:fillColor="#FFFFFF"/>
+
+    <!-- Cloud drop shadow -->
+    <path
+        android:pathData="
+          M 38,69
+          A 9,9 0 0,1 38,51
+          A 9,9 0 0,1 47,42.5
+          A 12,12 0 0,1 68,44
+          A 8,8 0 0,1 76,55
+          A 8,8 0 0,1 70,69
+          Z"
+        android:fillColor="#000000"
+        android:fillAlpha="0.10"/>
+
+    <!-- Sync arc 1: lower half CW, cyan to teal -->
+    <path
+        android:pathData="M 49.14,81.57 A 28,28 0 1,1 49.14,26.43"
         android:fillColor="#00000000"
-        android:strokeWidth="8.5"
+        android:strokeWidth="5.5"
-        android:strokeLineCap="round"
+        android:strokeLineCap="round">
-        android:strokeLineJoin="round">
         <aapt:attr name="android:strokeColor">
             <gradient android:type="linear"
-                android:startX="26" android:startY="34"
+                android:startX="49.14" android:startY="81.57"
-                android:endX="82" android:endY="34"
+                android:endX="49.14" android:endY="26.43"
-                android:startColor="#64C8FF"
+                android:startColor="#40C4FF"
-                android:endColor="#32EDBB"/>
+                android:endColor="#00BFA5"/>
         </aapt:attr>
     </path>
-    <path android:pathData="M 77.5,27.3 L 82,34 L 74.0,34.5 Z" android:fillColor="#32EDBB"/>
+    <!-- Arrowhead at end of arc 1 (near 260 deg) -->
+    <path android:pathData="M 42.5,30.5 L 49.14,26.43 L 46.0,34.5 Z"
+        android:fillColor="#00BFA5"/>
 
-    <!-- Arc 2 — middle -->
+    <!-- Sync arc 2: upper half CW, teal to cyan -->
     <path
-        android:pathData="M 26,54 Q 54,40 82,54"
+        android:pathData="M 58.86,26.43 A 28,28 0 1,1 58.86,81.57"
         android:fillColor="#00000000"
-        android:strokeWidth="8.5"
+        android:strokeWidth="5.5"
-        android:strokeLineCap="round"
+        android:strokeLineCap="round">
-        android:strokeLineJoin="round">
         <aapt:attr name="android:strokeColor">
             <gradient android:type="linear"
-                android:startX="26" android:startY="54"
+                android:startX="58.86" android:startY="26.43"
-                android:endX="82" android:endY="54"
+                android:endX="58.86" android:endY="81.57"
-                android:startColor="#64C8FF"
+                android:startColor="#00BFA5"
-                android:endColor="#32EDBB"/>
+                android:endColor="#40C4FF"/>
         </aapt:attr>
     </path>
-    <path android:pathData="M 77.5,47.3 L 82,54 L 74.0,54.5 Z" android:fillColor="#32EDBB"/>
+    <!-- Arrowhead at end of arc 2 (near 80 deg) -->
-
+    <path android:pathData="M 65.5,77.5 L 58.86,81.57 L 62.0,73.5 Z"
-    <!-- Arc 3 — bottom -->
+        android:fillColor="#40C4FF"/>
-    <path
-        android:pathData="M 26,74 Q 54,60 82,74"
-        android:fillColor="#00000000"
-        android:strokeWidth="8.5"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:type="linear"
-                android:startX="26" android:startY="74"
-                android:endX="82" android:endY="74"
-                android:startColor="#64C8FF"
-                android:endColor="#32EDBB"/>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M 77.5,67.3 L 82,74 L 74.0,74.5 Z" android:fillColor="#32EDBB"/>
 
 </vector>

version.properties

@@ -1,2 +1,2 @@
-VERSION_NAME=1.0.24
+VERSION_NAME=1.0.26
-VERSION_CODE=25
+VERSION_CODE=27