v1.0.31: fix remaining sync loop triggers + icon redesign

Three additional fixes found via live device logs:

1. Startup race window: FileObserver fires immediately after
   startWatching() before catchupScan coroutine runs, starting a 5s
   debounce with cooldown=0. Fixed by setting a 15s startup cooldown
   in watchPath() BEFORE calling watchDirRecursive.

2. Stale debounce bypass: debounce job started with cooldown=0 fires
   5s later even after catchupScan has already set cooldown and started
   a catchup sync. Fixed by re-checking cooldown after the 5s delay
   and aborting if already active.

3. Debounce not cancelled by catchupScan: if a debounce was queued
   before catchupScan ran, catchupScan would enqueue a catchup sync
   AND the old debounce would fire 5s later enqueuing a second sync.
   Fixed by cancelling pending debounce in catchupScan before enqueue.

Icon: four thick arcs (blue/red/green/orange) in a 4-way pinwheel
with over/under ordering. White sync-arrow circle at center.
Pure black background.

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

app/src/main/kotlin/com/syncflow/domain/sync/SyncEngine.kt

@@ -62,13 +62,28 @@ class SyncEngine @Inject constructor(
         else
             LocalAccessor.JavaFile(File(localPath))
 
-    private suspend fun performSync(pair: SyncPair, provider: CloudProvider): SyncResult {
+    private suspend fun performSync(
+        pair: SyncPair,
+        provider: CloudProvider,
+        isRetry: Boolean = false,
+    ): SyncResult {
         val accessor = makeAccessor(pair.localPath)
-        val knownStates = fileStateDao.getForPair(pair.id).associateBy { it.relativePath }
+        var knownStates = fileStateDao.getForPair(pair.id).associateBy { it.relativePath }
         val remoteFiles = provider.listFiles(pair.remotePath).getOrThrow()
             .associateBy { it.path.removePrefix(pair.remotePath).trimStart('/') }
         val localFiles = accessor.walkFiles(pair)
 
+        // Self-healing: if every known-state path is absent from the current local scan but
+        // the local folder does have files, the localPath was changed without clearing state.
+        // The stale records would cause every old file to look like "DELETE_REMOTE" and every
+        // new file to re-upload indefinitely. Wipe and retry once as a fresh initial sync.
+        if (!isRetry && knownStates.isNotEmpty() && localFiles.isNotEmpty() &&
+            knownStates.keys.none { it in localFiles }) {
+            Timber.w("SyncEngine: stale folder states detected for pair ${pair.id} — resetting")
+            fileStateDao.deleteForPair(pair.id)
+            return performSync(pair, provider, isRetry = true)
+        }
+
         val allPaths = (localFiles.keys + remoteFiles.keys + knownStates.keys).toSet()
         val hasPriorSyncState = knownStates.isNotEmpty()
         val semaphore = Semaphore(4)
@@ -126,7 +141,9 @@ class SyncEngine @Inject constructor(
                                 logEvent(pair.id, SyncEventType.FILE_DOWNLOADED, rel, null, bytes)
                                 FileOutcome(downloaded = 1, bytesTransferred = bytes,
                                     newState = buildState(pair.id, rel,
-                                        LocalFileInfo(rel, remote!!.sizeBytes, localMtime), remoteAfterTransfer = remote))
+                                        LocalFileInfo(rel, remote!!.sizeBytes, localMtime),
+                                        remoteAfterTransfer = remote,
+                                        storeLocalMtime = false))
                             }
                             SyncDecision.DELETE_LOCAL -> {
                                 accessor.delete(rel)
@@ -203,10 +220,13 @@ class SyncEngine @Inject constructor(
         rel: String,
         local: LocalFileInfo?,
         remoteAfterTransfer: RemoteFile?,
+        storeLocalMtime: Boolean = true,
     ) = SyncFileStateEntity(
         syncPairId = pairId,
         relativePath = rel,
-        localModifiedAt = local?.lastModifiedMs?.let { Instant.ofEpochMilli(it) },
+        // When storeLocalMtime=false, leave localModifiedAt null so the SKIP reconciliation
+        // pass on the next sync reads it from the walkFiles cursor (avoids SAF stale-mtime loops).
+        localModifiedAt = if (storeLocalMtime) local?.lastModifiedMs?.let { Instant.ofEpochMilli(it) } else null,
         localSizeBytes = local?.sizeBytes ?: 0L,
         localHash = null,
         remoteModifiedAt = remoteAfterTransfer?.modifiedAt,
@@ -236,12 +256,16 @@ internal fun syncDecide(
 
     // Treat null known timestamps as "not yet recorded" — don't treat as changed.
     // The SKIP reconciliation pass will fill them in on the next sync.
+    // Use second-precision for both sides: FAT32 has 2-second mtime resolution, WebDAV
+    // RFC-1123 has 1-second resolution, so millisecond comparison causes phantom "changed"
+    // detections and rewrite loops after a fresh download/upload.
     val localChanged = known == null ||
         (localExists && known.localModifiedAt != null &&
-            local!!.lastModifiedMs != known.localModifiedAt.toEpochMilli())
+            local!!.lastModifiedMs / 1000 != known.localModifiedAt.epochSecond)
     val remoteChanged = known == null ||
         (remoteExists && known.remoteModifiedAt != null &&
-            (remote!!.etag != known.remoteEtag || remote.modifiedAt != known.remoteModifiedAt))
+            (remote!!.etag != known.remoteEtag ||
+             remote.modifiedAt.epochSecond != known.remoteModifiedAt.epochSecond))
 
     return when {
         !localExists && !remoteExists -> SyncDecision.SKIP

app/src/main/kotlin/com/syncflow/ui/addpair/AddPairViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.syncflow.data.db.CloudAccountDao
+import com.syncflow.data.db.SyncFileStateDao
 import com.syncflow.data.db.SyncPairDao
 import com.syncflow.data.db.entities.CloudAccountEntity
 import com.syncflow.data.db.entities.SyncPairEntity
@@ -58,6 +59,7 @@ data class AddPairUiState(
 @HiltViewModel
 class AddPairViewModel @Inject constructor(
     private val syncPairDao: SyncPairDao,
+    private val fileStateDao: SyncFileStateDao,
     private val accountDao: CloudAccountDao,
     @ApplicationContext private val context: Context,
     savedState: SavedStateHandle,
@@ -148,7 +150,20 @@ class AddPairViewModel @Inject constructor(
                     notifyOnComplete = s.notifyOnComplete, notifyOnError = s.notifyOnError,
                     isEnabled = true, lastSyncAt = null, lastSyncResult = SyncStatus.IDLE, pendingConflicts = 0,
                 )
-                if (editPairId == null) syncPairDao.insert(entity) else syncPairDao.update(entity)
+                if (editPairId == null) {
+                    syncPairDao.insert(entity)
+                } else {
+                    val existing = syncPairDao.getById(editPairId)
+                    syncPairDao.update(entity)
+                    // If local or remote folder changed, old file-state records no longer
+                    // correspond to any real path — wipe them so the next sync starts fresh
+                    // instead of trying to delete/re-upload stale paths.
+                    if (existing != null &&
+                        (existing.localPath != entity.localPath || existing.remotePath != entity.remotePath)
+                    ) {
+                        fileStateDao.deleteForPair(editPairId)
+                    }
+                }
             }
                 .onSuccess {
                     if (s.scheduleType == ScheduleType.ON_CHANGE) FileWatchService.start(context)

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

@@ -23,6 +23,8 @@ import com.syncflow.data.db.SyncPairDao
 import com.syncflow.domain.model.ScheduleType
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
@@ -35,11 +37,16 @@ class FileWatchService : Service() {
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private val mainHandler = Handler(Looper.getMainLooper())
+    // Prevents concurrent refresh() calls from doubling watchers + catchup scans
+    private val refreshMutex = Mutex()
 
     // Multiple FileObserver instances per pair: one per directory (recursive)
     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.
+    private val syncCooldownUntil = mutableMapOf<Long, Long>()
 
     companion object {
         const val CHANNEL_WATCH = "sync_watching"
@@ -78,7 +85,7 @@ class FileWatchService : Service() {
 
     override fun onBind(intent: Intent?): IBinder? = null
 
-    private suspend fun refresh() {
+    private suspend fun refresh() = refreshMutex.withLock {
         clearWatchers()
         val pairs = syncPairDao.getEnabled().filter { it.scheduleType == ScheduleType.ON_CHANGE }
 
@@ -142,6 +149,9 @@ class FileWatchService : Service() {
             return
         }
         fileObservers[pairId] = mutableListOf()
+        // Set startup cooldown BEFORE registering watchers so inotify events that fire
+        // immediately on registration don't trigger the debounce before catchupScan runs.
+        syncCooldownUntil[pairId] = System.currentTimeMillis() + 15_000
         watchDirRecursive(dir, pairId, wifiOnly, chargingOnly)
         Timber.d("FileWatchService: watching pair $pairId at $path (${fileObservers[pairId]?.size} dirs)")
         scope.launch { catchupScan(pairId, dir, wifiOnly, chargingOnly) }
@@ -200,36 +210,66 @@ class FileWatchService : Service() {
         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)
+            // Hold cooldown for duration of sync + 60s settle
+            syncCooldownUntil[pairId] = System.currentTimeMillis() + 120_000
+            val req = SyncWorker.buildOneTimeRequest(pairId, wifiOnly, chargingOnly)
             WorkManager.getInstance(applicationContext)
-                .enqueueUniqueWork(
-                    "catchup_$pairId",
-                    ExistingWorkPolicy.KEEP,
-                    SyncWorker.buildOneTimeRequest(pairId, wifiOnly, chargingOnly),
-                )
+                .enqueueUniqueWork("catchup_$pairId", ExistingWorkPolicy.KEEP, req)
+            scope.launch {
+                try {
+                    WorkManager.getInstance(applicationContext)
+                        .getWorkInfoByIdFlow(req.id)
+                        .first { it?.state?.isFinished == true }
+                    syncCooldownUntil[pairId] = System.currentTimeMillis() + 60_000
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (_: Exception) {
+                    syncCooldownUntil[pairId] = System.currentTimeMillis() + 60_000
+                }
+            }
         }
     }
 
     private fun onChangeDetected(pairId: Long, wifiOnly: Boolean, chargingOnly: Boolean) {
+        // Ignore events fired by our own sync writing files — prevents the feedback loop
+        // where downloaded/uploaded files trigger another sync indefinitely.
+        if (System.currentTimeMillis() < (syncCooldownUntil[pairId] ?: 0L)) {
+            Timber.d("FileWatchService: suppressing change event for pair $pairId (sync cooldown)")
+            return
+        }
+
         debounceJobs[pairId]?.cancel()
         debounceJobs[pairId] = scope.launch {
             delay(5_000)
+            // Re-check: catchupScan or another path may have already set a cooldown
+            // and handled this sync while we were waiting.
+            if (System.currentTimeMillis() < (syncCooldownUntil[pairId] ?: 0L)) {
+                Timber.d("FileWatchService: debounce fired but cooldown active for pair $pairId, skipping")
+                return@launch
+            }
             val pair = syncPairDao.getById(pairId)
             if (pair == null || !pair.isEnabled) return@launch
             Timber.d("FileWatchService: triggering sync for pair $pairId after debounce")
 
+            // Block new triggers from this point until 60s after sync completes
+            syncCooldownUntil[pairId] = System.currentTimeMillis() + 120_000
+
             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 }
+                    // Extend cooldown: 60s after sync finishes to let filesystem settle
+                    syncCooldownUntil[pairId] = System.currentTimeMillis() + 60_000
                     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 ""}"
@@ -239,8 +279,11 @@ class FileWatchService : Service() {
                         updateNotificationDynamic("$watching")
                     }
                     delay(12_000)
-                    updateNotificationDynamic(null) // revert to default watching text
+                    updateNotificationDynamic(null)
+                } catch (e: CancellationException) {
+                    throw e
                 } catch (_: Exception) {
+                    syncCooldownUntil[pairId] = System.currentTimeMillis() + 60_000
                     updateNotificationDynamic(null)
                 }
             }
@@ -254,6 +297,7 @@ class FileWatchService : Service() {
         contentObservers.clear()
         debounceJobs.values.forEach { it.cancel() }
         debounceJobs.clear()
+        syncCooldownUntil.clear()
     }
 
     private fun ensureChannel() {

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

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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 purple-black base, matching the knot reference icon's dark background -->
-    <path android:pathData="M0,0 H108 V108 H0 Z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:type="radial"
-                android:gradientRadius="76"
-                android:centerX="54" android:centerY="44"
-                android:startColor="#1E1628"
-                android:endColor="#080610"/>
-        </aapt:attr>
-    </path>
+    <!-- Pure black background -->
+    <path android:pathData="M0,0 H108 V108 H0 Z"
+        android:fillColor="#000000"/>
 
 </vector>

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

@@ -1,99 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  SyncFlow icon foreground (108x108dp, safe zone 72dp centred at 54,54).
-
-  Design: two thick tube-style sync arcs that form a circular refresh symbol,
-  inspired by the braided knot icon's color palette:
-    Arc 1 (left side, CW): coral #E8665A -> orange #E8A040
-    Arc 2 (right side, CW): steel blue #4A7FD4 -> purple #7B5EA7
-  Each arc has a thin inner highlight to give a 3D glossy tube look.
-
-  Geometry: circle centred at (54,54), radius 27.
-    Arc 1: 100 deg to 260 deg CW (160 deg, through west/left)
-      start (49.31, 80.59)  end (49.31, 27.41)
-    Arc 2: 280 deg to  80 deg CW (160 deg, through east/right)
-      start (58.69, 27.41)  end (58.69, 80.59)
-  20-degree gaps at top (~260-280) and bottom (~80-100).
-
-  Highlights at r=23 (inner edge):
-    Arc 1 highlight: (49.99, 76.64) to (49.99, 31.36)
-    Arc 2 highlight: (58.01, 31.36) to (58.01, 76.64)
--->
 <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">
 
-    <!-- Arc 1 shadow (offset slightly down-right for depth) -->
+    <!--
+      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:pathData="M 50.31,82.59 A 27,27 0 0,1 50.31,29.41"
+        android:strokeColor="#2979FF"
+        android:strokeWidth="8.5"
         android:fillColor="#00000000"
-        android:strokeWidth="9"
         android:strokeLineCap="round"
-        android:strokeColor="#44000000"/>
+        android:pathData="M 54,36 A 18,18 0 1,1 45,70"/>
 
-    <!-- Arc 2 shadow -->
+    <!-- Green — starts at bottom, sweeps clockwise to upper-right -->
     <path
-        android:pathData="M 59.69,29.41 A 27,27 0 0,1 59.69,82.59"
+        android:strokeColor="#00C853"
+        android:strokeWidth="8.5"
         android:fillColor="#00000000"
-        android:strokeWidth="9"
         android:strokeLineCap="round"
-        android:strokeColor="#44000000"/>
+        android:pathData="M 54,72 A 18,18 0 1,1 63,38"/>
 
-    <!-- Arc 1: left side, coral to orange -->
+    <!-- Red — starts at right, sweeps clockwise to lower-left -->
     <path
-        android:pathData="M 49.31,80.59 A 27,27 0 0,1 49.31,27.41"
+        android:strokeColor="#E53935"
+        android:strokeWidth="8.5"
         android:fillColor="#00000000"
-        android:strokeWidth="9"
-        android:strokeLineCap="round">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:type="linear"
-                android:startX="49.31" android:startY="80.59"
-                android:endX="49.31" android:endY="27.41"
-                android:startColor="#E8665A"
-                android:endColor="#E8A040"/>
-        </aapt:attr>
-    </path>
+        android:strokeLineCap="round"
+        android:pathData="M 72,54 A 18,18 0 1,1 39,45"/>
 
-    <!-- Arc 2: right side, blue to purple -->
+    <!-- Orange — starts at left, sweeps clockwise to upper-right -->
     <path
-        android:pathData="M 58.69,27.41 A 27,27 0 0,1 58.69,80.59"
+        android:strokeColor="#FF6D00"
+        android:strokeWidth="8.5"
         android:fillColor="#00000000"
-        android:strokeWidth="9"
-        android:strokeLineCap="round">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:type="linear"
-                android:startX="58.69" android:startY="27.41"
-                android:endX="58.69" android:endY="80.59"
-                android:startColor="#4A7FD4"
-                android:endColor="#7B5EA7"/>
-        </aapt:attr>
-    </path>
+        android:strokeLineCap="round"
+        android:pathData="M 36,54 A 18,18 0 1,1 69,63"/>
 
-    <!-- Arc 1 inner highlight (glossy tube sheen) -->
+    <!-- Re-draw blue start cap on top so it goes OVER orange end -->
     <path
-        android:pathData="M 49.99,76.64 A 23,23 0 0,1 49.99,31.36"
+        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:strokeLineCap="round"
-        android:strokeColor="#55FFC8B0"/>
-
-    <!-- Arc 2 inner highlight -->
-    <path
-        android:pathData="M 58.01,31.36 A 23,23 0 0,1 58.01,76.64"
         android:fillColor="#00000000"
-        android:strokeWidth="2.5"
-        android:strokeLineCap="round"
-        android:strokeColor="#55B0C8FF"/>
+        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"/>
 
-    <!-- Arrowhead at end of Arc 1 (260 deg, top-left area, pointing right-up) -->
-    <path android:pathData="M 42.13,32.74 L 49.31,27.41 L 40.73,24.86 Z"
-        android:fillColor="#E8A040"/>
+    <!-- Top arrow head (pointing up) -->
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 54,46.5 L 57,50.5 L 51,50.5 Z"/>
 
-    <!-- Arrowhead at end of Arc 2 (80 deg, bottom-right area, pointing left-down) -->
-    <path android:pathData="M 67.27,83.14 L 58.69,80.59 L 65.87,75.26 Z"
-        android:fillColor="#7B5EA7"/>
+    <!-- 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>

version.properties

@@ -1,2 +1,2 @@
-VERSION_NAME=1.0.27
-VERSION_CODE=28
+VERSION_NAME=1.0.31
+VERSION_CODE=32