1.0.40: fix icon sizing (adaptive XML) + semantic status colors

- Restore mipmap-anydpi-v26 adaptive icon XMLs so Android 8+ shows the icon at full size instead of scaling it to 66% safe zone - Foreground at 108dp sizes (108-432px), background #050E05 - Status colors now semantic (not tied to app red/orange theme): SUCCESS=green, SYNCING=blue, FAILED=red, PARTIAL=orange, CONFLICT=amber Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1.0.39: fix OOM on large-file uploads; use exact reference icon
2026-05-25 19:49:34 +00:00 · 2026-05-25 17:51:23 +00:00 · 2026-05-25 15:59:59 +00:00 · 2026-05-25 15:13:43 +00:00 · 2026-05-25 14:11:58 +00:00
34 changed files with 82 additions and 175 deletions
@@ -13,6 +13,8 @@ import okhttp3.*
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
+import okio.BufferedSink
+import okio.source
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserFactory
 import java.io.InputStream
@@ -84,13 +86,18 @@ open class WebDavProvider(protected val account: CloudAccount) : CloudProvider {
        onProgress: (Long) -> Unit,
    ): Result<RemoteFile> = runCatching {
        withContext(Dispatchers.IO) {
-            val bytes = localStream.readBytes()
-            val body = bytes.toRequestBody("application/octet-stream".toMediaType())
+            val body = object : RequestBody() {
+                override fun contentType() = "application/octet-stream".toMediaType()
+                override fun contentLength() = sizeBytes
+                override fun writeTo(sink: BufferedSink) {
+                    localStream.source().use { source -> sink.writeAll(source) }
+                }
+            }
            val req = Request.Builder().url(url(remotePath)).put(body).build()
            client.newCall(req).execute().use { resp ->
                if (!resp.isSuccessful) throw Exception("Upload HTTP ${resp.code}")
            }
-            onProgress(bytes.size.toLong())
+            onProgress(sizeBytes)
            getFileMetadata(remotePath).getOrThrow()
        }
    }
@@ -107,11 +107,10 @@ class SyncEngine @Inject constructor(

                        when (decision) {
                            SyncDecision.UPLOAD -> {
-                                var uploadedRemoteFile: RemoteFile? = null
                                val bytes = runCatching {
                                    ensureRemoteDirs(provider, pair.remotePath, rel)
                                    accessor.openInputStream(rel)?.use { stream ->
-                                        uploadedRemoteFile = provider.uploadFile(stream, "${pair.remotePath}/$rel", local!!.sizeBytes) { }.getOrThrow()
+                                        provider.uploadFile(stream, "${pair.remotePath}/$rel", local!!.sizeBytes) { }.getOrThrow()
                                    }
                                    local!!.sizeBytes
                                }.getOrElse { e ->
@@ -120,8 +119,12 @@ class SyncEngine @Inject constructor(
                                    return@withPermit FileOutcome(failed = 1)
                                }
                                logEvent(pair.id, SyncEventType.FILE_UPLOADED, rel, null, bytes)
+                                // Don't store remote metadata from upload response — the server (Nextcloud etc.)
+                                // may change mtime/etag during post-upload processing. Leaving remoteModifiedAt
+                                // null forces the SKIP reconciliation on the next sync to fill it in from the
+                                // directory listing, which is the same source all future syncs will use.
                                FileOutcome(uploaded = 1, bytesTransferred = bytes,
-                                    newState = buildState(pair.id, rel, local!!, remoteAfterTransfer = uploadedRemoteFile))
+                                    newState = buildState(pair.id, rel, local!!, remoteAfterTransfer = null))
                            }
                            SyncDecision.DOWNLOAD -> {
                                val bytes = runCatching {
@@ -146,13 +149,15 @@ class SyncEngine @Inject constructor(
                                        storeLocalMtime = false))
                            }
                            SyncDecision.DELETE_LOCAL -> {
-                                accessor.delete(rel)
+                                val deleted = accessor.delete(rel)
+                                if (!deleted) Timber.w("SyncEngine: DELETE_LOCAL failed (silent) for $rel")
                                fileStateDao.delete(pair.id, rel)
                                logEvent(pair.id, SyncEventType.FILE_DELETED, rel, "local", 0)
                                FileOutcome(deleted = 1)
                            }
                            SyncDecision.DELETE_REMOTE -> {
-                                provider.deleteFile("${pair.remotePath}/$rel")
+                                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)
@@ -283,21 +288,15 @@ internal fun syncDecide(
        }

        !localExists && remoteExists -> when {
-            known == null -> if (!hasPriorSyncState) {
-                // Initial sync: no history at all — remote files are new, download them.
+            known == null -> {
+                // No state record: could be a new remote file OR a file whose state was lost.
+                // Downloading is always safer than deleting — if the user deleted the local
+                // copy intentionally, the state record will still exist (known != null) and
+                // the else-branch below correctly deletes the remote copy.
                when (direction) {
                    SyncDirection.DOWNLOAD_ONLY, SyncDirection.TWO_WAY -> SyncDecision.DOWNLOAD
                    else -> SyncDecision.SKIP
                }
-            } else {
-                // Pair has been synced before but this file has no state record
-                // (e.g. uploaded before state-tracking was fixed). Treat the same
-                // as a known remote-deletion: apply mirror/keep behavior.
-                when {
-                    deleteBehavior == DeleteBehavior.KEEP -> SyncDecision.SKIP
-                    direction == SyncDirection.UPLOAD_ONLY || direction == SyncDirection.TWO_WAY -> SyncDecision.DELETE_REMOTE
-                    else -> SyncDecision.SKIP
-                }
            }
            else -> when {
                deleteBehavior == DeleteBehavior.KEEP -> SyncDecision.SKIP
@@ -247,12 +247,12 @@ private fun EmptyState(modifier: Modifier = Modifier, onAdd: () -> Unit) {

 private val SyncStatus.accentColor: Color
    @Composable get() = when (this) {
-        SyncStatus.SUCCESS              -> MaterialTheme.colorScheme.primary
-        SyncStatus.SYNCING              -> MaterialTheme.colorScheme.secondary
-        SyncStatus.FAILED               -> MaterialTheme.colorScheme.error
-        SyncStatus.CONFLICT,
-        SyncStatus.PARTIAL              -> MaterialTheme.colorScheme.tertiary
-        SyncStatus.IDLE                 -> MaterialTheme.colorScheme.outline
+        SyncStatus.SUCCESS  -> Color(0xFF2E7D32)  // green  — done, healthy
+        SyncStatus.SYNCING  -> Color(0xFF1565C0)  // blue   — in progress
+        SyncStatus.FAILED   -> Color(0xFFC62828)  // red    — error
+        SyncStatus.PARTIAL  -> Color(0xFFE65100)  // orange — some files failed
+        SyncStatus.CONFLICT -> Color(0xFFF9A825)  // amber  — needs resolution
+        SyncStatus.IDLE     -> MaterialTheme.colorScheme.outline
    }

 private fun String.toDisplayPath(): String {
@@ -20,7 +20,9 @@ import com.syncflow.MainActivity
 import com.syncflow.R
 import com.syncflow.data.db.SyncFileStateDao
 import com.syncflow.data.db.SyncPairDao
+import com.syncflow.data.db.entities.toDomain
 import com.syncflow.domain.model.ScheduleType
+import com.syncflow.domain.sync.LocalAccessor
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
@@ -44,8 +46,10 @@ class FileWatchService : Service() {
    private val fileObservers = mutableMapOf<Long, MutableList<FileObserver>>()
    private val contentObservers = mutableMapOf<Long, ContentObserver>()
    private val debounceJobs = mutableMapOf<Long, Job>()
-    // After a watcher-triggered sync completes, suppress FileObserver events for this long
-    // to stop the feedback loop: sync writes files → FileObserver fires → another sync → repeat.
+    // Persistent monitors that watch WorkManager for ANY sync (manual, catchup, onchange)
+    // so the cooldown is set regardless of who triggered the sync.
+    private val syncMonitorJobs = mutableMapOf<Long, Job>()
+    // After a sync completes, suppress FileObserver events for this long.
    private val syncCooldownUntil = mutableMapOf<Long, Long>()

    companion object {
@@ -154,9 +158,36 @@ class FileWatchService : Service() {
        syncCooldownUntil[pairId] = System.currentTimeMillis() + 15_000
        watchDirRecursive(dir, pairId, wifiOnly, chargingOnly)
        Timber.d("FileWatchService: watching pair $pairId at $path (${fileObservers[pairId]?.size} dirs)")
+        startSyncMonitor(pairId)
        scope.launch { catchupScan(pairId, dir, wifiOnly, chargingOnly) }
    }

+    // Watches WorkManager for ANY sync tagged sync_$pairId (manual, catchup, onchange).
+    // Sets cooldown while running and for 60s after, so FileObserver events from our
+    // own file writes never trigger a re-sync regardless of what started the sync.
+    private fun startSyncMonitor(pairId: Long) {
+        syncMonitorJobs[pairId]?.cancel()
+        syncMonitorJobs[pairId] = scope.launch {
+            var wasSyncing = false
+            WorkManager.getInstance(applicationContext)
+                .getWorkInfosByTagFlow("sync_$pairId")
+                .collect { infos ->
+                    val isSyncing = infos.any {
+                        it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED
+                    }
+                    if (isSyncing) {
+                        Timber.d("FileWatchService: sync active for pair $pairId — cooldown extended")
+                        syncCooldownUntil[pairId] = System.currentTimeMillis() + 120_000
+                        wasSyncing = true
+                    } else if (wasSyncing) {
+                        Timber.d("FileWatchService: sync finished for pair $pairId — 60s settle cooldown")
+                        syncCooldownUntil[pairId] = System.currentTimeMillis() + 60_000
+                        wasSyncing = false
+                    }
+                }
+        }
+    }
+
    private fun watchDirRecursive(dir: File, pairId: Long, wifiOnly: Boolean, chargingOnly: Boolean) {
        if (!dir.isDirectory) return
        val mask = FileObserver.CREATE or FileObserver.DELETE or FileObserver.MODIFY or
@@ -195,21 +226,25 @@ class FileWatchService : Service() {
        val known = fileStateDao.getForPair(pairId).associateBy { it.relativePath }
        if (known.isEmpty()) return // Never synced — first sync will be triggered manually

-        val current = mutableMapOf<String, Long>()
-        dir.walk().filter { it.isFile }.forEach { f ->
-            current[f.relativeTo(dir).path.replace('\\', '/')] = f.lastModified()
-        }
+        val pairEntity = syncPairDao.getById(pairId) ?: return
+        val pair = pairEntity.toDomain()
+        // Use the same accessor + filters as SyncEngine so hidden/excluded/size-filtered files
+        // don't appear as "new" in the catchup scan and trigger a perpetual sync loop.
+        val accessor = if (pair.localPath.startsWith("content://"))
+            LocalAccessor.Saf(Uri.parse(pair.localPath), contentResolver)
+        else
+            LocalAccessor.JavaFile(dir)
+        val current = accessor.walkFiles(pair)

        val hasNew      = current.any { (rel, _) -> rel !in known }
-        val hasModified = current.any { (rel, mtime) ->
+        val hasModified = current.any { (rel, info) ->
            val s = known[rel]; s != null && s.localModifiedAt != null &&
-            s.localModifiedAt.toEpochMilli() != mtime
+            s.localModifiedAt.epochSecond != info.lastModifiedMs / 1000
        }
        val hasDeleted  = known.keys.any { rel -> rel !in current }

        if (hasNew || hasModified || hasDeleted) {
            Timber.d("FileWatchService: catchup detected changes for pair $pairId, scheduling sync")
-            val pair = syncPairDao.getById(pairId) ?: return
            // Cancel any debounce that started before our startup cooldown was set
            debounceJobs[pairId]?.cancel()
            debounceJobs.remove(pairId)
@@ -297,6 +332,8 @@ class FileWatchService : Service() {
        contentObservers.clear()
        debounceJobs.values.forEach { it.cancel() }
        debounceJobs.clear()
+        syncMonitorJobs.values.forEach { it.cancel() }
+        syncMonitorJobs.clear()
        syncCooldownUntil.clear()
    }

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <!-- Pure black background -->
-    <path android:pathData="M0,0 H108 V108 H0 Z"
-        android:fillColor="#000000"/>
-
-</vector>
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-
-    <!--
-      Four thick arcs arranged as an interlocked pinwheel.
-      Each arc sweeps ~210 degrees, rounded caps, radius 18 from center (54,54).
-      Draw order creates natural over/under at the four crossing points:
-        blue under green, green under red, red under orange, orange under blue (re-draw blue tip).
-
-      Arc endpoints computed at radius 18, sweep 210 deg clockwise:
-        start angle  end angle    start point    end point
-        270 (top)    120          (54, 36)        (45, 70)
-          0 (right)  210          (72, 54)        (39, 45)
-         90 (bot)    300          (54, 72)        (63, 38)
-        180 (left)   390=30       (36, 54)        (69, 63)
-    -->
-
-    <!-- Blue — starts at top, sweeps clockwise to lower-left -->
-    <path
-        android:strokeColor="#2979FF"
-        android:strokeWidth="8.5"
-        android:fillColor="#00000000"
-        android:strokeLineCap="round"
-        android:pathData="M 54,36 A 18,18 0 1,1 45,70"/>
-
-    <!-- Green — starts at bottom, sweeps clockwise to upper-right -->
-    <path
-        android:strokeColor="#00C853"
-        android:strokeWidth="8.5"
-        android:fillColor="#00000000"
-        android:strokeLineCap="round"
-        android:pathData="M 54,72 A 18,18 0 1,1 63,38"/>
-
-    <!-- Red — starts at right, sweeps clockwise to lower-left -->
-    <path
-        android:strokeColor="#E53935"
-        android:strokeWidth="8.5"
-        android:fillColor="#00000000"
-        android:strokeLineCap="round"
-        android:pathData="M 72,54 A 18,18 0 1,1 39,45"/>
-
-    <!-- Orange — starts at left, sweeps clockwise to upper-right -->
-    <path
-        android:strokeColor="#FF6D00"
-        android:strokeWidth="8.5"
-        android:fillColor="#00000000"
-        android:strokeLineCap="round"
-        android:pathData="M 36,54 A 18,18 0 1,1 69,63"/>
-
-    <!-- Re-draw blue start cap on top so it goes OVER orange end -->
-    <path
-        android:strokeColor="#2979FF"
-        android:strokeWidth="8.5"
-        android:fillColor="#00000000"
-        android:strokeLineCap="round"
-        android:pathData="M 54,36 A 18,18 0 0,1 62,37.5"/>
-
-    <!-- White sync circle at center -->
-    <path
-        android:fillColor="#000000"
-        android:pathData="M 45,54 A 9,9 0 1,0 63,54 A 9,9 0 1,0 45,54 Z"/>
-
-    <!-- Sync ring -->
-    <path
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="2.5"
-        android:fillColor="#00000000"
-        android:pathData="M 46.5,54 A 7.5,7.5 0 1,0 61.5,54 A 7.5,7.5 0 1,0 46.5,54 Z"/>
-
-    <!-- Top arrow head (pointing up) -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M 54,46.5 L 57,50.5 L 51,50.5 Z"/>
-
-    <!-- Bottom arrow head (pointing down) -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M 54,61.5 L 51,57.5 L 57,57.5 Z"/>
-
-</vector>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#2196F3</color>
+    <color name="ic_launcher_background">#050E05</color>
 </resources>
@@ -1,2 +1,2 @@
-VERSION_NAME=1.0.31
-VERSION_CODE=32
+VERSION_NAME=1.0.40
+VERSION_CODE=41
Author	SHA1	Message	Date
amir	c869f84a9d	1.0.40: fix icon sizing (adaptive XML) + semantic status colors - Restore mipmap-anydpi-v26 adaptive icon XMLs so Android 8+ shows the icon at full size instead of scaling it to 66% safe zone - Foreground at 108dp sizes (108-432px), background #050E05 - Status colors now semantic (not tied to app red/orange theme): SUCCESS=green, SYNCING=blue, FAILED=red, PARTIAL=orange, CONFLICT=amber Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-25 19:49:34 +00:00
amir	c3be23417d	1.0.39: fix OOM on large-file uploads; use exact reference icon - WebDavProvider: replace readBytes() with streaming RequestBody (Okio sink.writeAll) so large files (1+ GB) upload without allocating the full file in heap — fixes PARTIAL sync status - App icon: replace vector XML with PNG mipmaps generated directly from the user-provided reference image at all densities Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-25 17:51:23 +00:00
amir	ae10ed0c82	Fix upload rollback and update app icon Upload rollback fix: after uploading a file, do not store the remote mtime/etag from the upload response PROPFIND. Nextcloud and other WebDAV servers can change a file's Last-Modified or ETag after upload (thumbnail generation, checksums, folder aggregation). Storing stale metadata caused the next sync to see remoteChanged=true and download the file back, reverting the upload. Leaving remoteAfterTransfer=null forces the SKIP reconciliation pass to fill in remote state from the directory listing, which is the same source all future syncs use. Icon: update foreground to thick ribbons with 3D highlight stripes (blue/green/red/orange, width 12 + highlight 5); update background to dark space theme with star dots. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-25 15:59:59 +00:00
amir	897b685c70	Fix perpetual sync loop and wrong delete decisions Three bugs fixed: 1. catchupScan used raw dir.walk() with no filters, causing hidden/excluded files to appear as "new" every startup and trigger a catchup sync. Fixed by using LocalAccessor.walkFiles(pair) which applies the same filters and uses the same mtime source (SAF cursor) as SyncEngine. 2. catchupScan compared localModifiedAt.toEpochMilli() vs File.lastModified() (millisecond precision) while SyncEngine uses second precision. Every file appeared "modified" after a successful sync. Fixed by using epochSecond. 3. syncDecide() treated !localExists && remoteExists && known==null as "user deleted local copy → delete remote" even on files that were never synced. Fixed to treat unknown remote files as new (download them), which is safe because a genuinely-deleted file will always have a known state record from the previous sync. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-25 15:13:43 +00:00
amir	4b20697bb1	v1.0.32: fix manual sync loop via WorkManager tag monitor Root cause: manual sync triggered from the UI had no cooldown set in FileWatchService, so file writes during any manual sync fired FileObserver → debounce → another sync → loop. Fix: startSyncMonitor() subscribes to getWorkInfosByTagFlow("sync_$pairId") and watches ALL sync work for each pair — manual, catchup, onchange — via the tag that SyncWorker.buildOneTimeRequest() always adds. - When any sync is RUNNING or ENQUEUED: cooldown extended to now+120s - When sync transitions from running to finished: 60s settle cooldown - Monitor job stored in syncMonitorJobs map and cancelled in clearWatchers() This means no matter what triggers a sync, FileObserver events from the resulting file writes are always suppressed until the folder settles. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-25 14:11:58 +00:00