v1.3.2: Skip-Family fix (#8) + Reconnecting UX polish - #9
Merged
Conversation
Spec for the fix to issue #8: 'Always skip on this iPhone' currently only ignores the original path, so future sync-conflict copies bypass the filter and conflicts reappear. Design adds a paired ignore pattern (original + sync-conflict-* glob), actively removes existing conflict copies, and groups the pair as a single row in the Sync Filters list.
Removes every sync-conflict copy of a given file in a folder, leaving the original on disk. Used by the 'Always skip on this iPhone' flow to actively clear conflict-copy leftovers when the user opts out of a file.
Pure helpers shared between the conflict-resolver Skip flow and the Sync Filters list rendering. Tests cover root files, nested paths, extension-less filenames, mixed-extension stems, and pair detection.
Single-call API for the conflict-resolver Skip flow. Writes the pair of ignore patterns, deletes existing conflict copies on disk, rescans, and refreshes the conflict cache. Returns the number of removed conflict copies so the UI can surface it in the success alert.
Replace the single-pattern addIgnorePattern call with the full Skip flow. Confirmation alert now mentions conflict copies and, when any existed on disk, the number that were removed. Dismisses the diff view on OK since the conflict no longer exists.
A paired '<X>' + '<X>.sync-conflict-*' renders as a single Custom Patterns entry with a '+ conflict copies' caption. Swipe-to-delete removes both lines from .stignore atomically. Orphan singletons keep their existing single-line rendering.
Adds the new 'conflict copies' alert variant plus singular/plural variants of the removed-count sentence and the '+ conflict copies' caption used by the Sync Filters list, for en / de / zh-Hans.
Add a per-device 'first observed disconnected' timestamp. Within a 30s window the device counts as 'reconnecting' (calm dashboard state, no warning); after the window it surfaces as a real disconnect via the existing Sync-Issues path. Single entry point applyDeviceList(_:) keeps the timestamp dictionary consistent with the devices array.
Insert a new branch in syncStatusText / syncStatusIcon / syncStatusColor that triggers when reconnectingRequiredDeviceIDs is non-empty. Dashboard icon swaps to a system ProgressView spinner for the iOS-native look familiar from pull-to-refresh, and a 'Restoring connection to N device(s)' caption appears under the status text.
Adds the three new keys consumed by the dashboard reconnecting branch.
|
Warning Review limit reached
Your plan currently allows 1 review/hour. Refill in 19 minutes and 45 seconds. Your organization has run out of usage credits. Purchase more in the billing tab. ⌛ How to resolve this issue?After more review capacity refills, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than trial, open-source, and free plans. In all cases, review capacity refills continuously over time. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (6)
📝 WalkthroughWalkthroughThis PR implements v1.3.2's two headline features: a "Skip Family" conflict resolver that atomically ignores a file and its Syncthing-generated conflict copies (deleting existing variants immediately), and a grace-period model for required-device disconnects (showing "Reconnecting…" for 30 seconds before surfacing the offline alert). Cross-platform infrastructure includes Go file cleanup, Swift model grouping, and updated UX throughout the sync dashboard and conflict/filter views. ChangesSkip Family Conflict Resolution & Device Reconnect Grace Period
Estimated code review effort🎯 4 (Complex) | ⏱️ ~50 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 5 | ❌ 2❌ Failed checks (1 warning, 1 inconclusive)
✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
🧹 Nitpick comments (1)
docs/sync-filters-ux.md (1)
121-121: 💤 Low valueOptional: Add language specifier to fenced code block.
The fenced code block at line 121 is missing a language identifier. Adding
```textor```plaintextwould resolve the markdownlint warning without changing the content.📝 Proposed fix
-``` +```text ⋯ menu └─ Always skip on this iPhone</details> <details> <summary>🤖 Prompt for AI Agents</summary>Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.In
@docs/sync-filters-ux.mdat line 121, The fenced code block that contains the
snippet starting with "⋯ menu" is missing a language identifier; update the
opening fence for that block (the fenced code block containing "⋯ menu" /
"Always skip on this iPhone") to use a plaintext language specifier such as
text (orplaintext) so the markdownlint warning is resolved while keeping
the content unchanged.</details> </blockquote></details> </blockquote></details> <details> <summary>🤖 Prompt for all review comments with AI agents</summary>Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.Inline comments:
In@ios/VaultSync/Models/SkipFamily.swift:
- Around line 35-55: The current pairing logic in the loop that builds
pairedGlobs and the second loop that emits SkipFamilyEntry uses
SyncthingManager.conflictGlob(forOriginalPath:) for every line, which can
wrongly pair wildcard or directory rules; update both loops to only consider
pairing when the original path is a concrete file path (e.g., exclude patterns
containing "*" or "?" or trailing "/" or any directory/glob-specific tokens).
Concretely: before calling conflictGlob(forOriginalPath:) or adding to
pairedGlobs/creating a paired SkipFamilyEntry, add a guard that verifies the
candidate line (and the derived glob) is a concrete file path (use the same
glob-detection logic in both the first loop that populates pairedGlobs and the
second loop that appends to result); keep using the existing symbols
(customLines, pairedGlobs, lineSet, conflictGlob(forOriginalPath:), consumed,
SkipFamilyEntry, hasConflictGlob) when implementing the guard.In
@ios/VaultSync/Services/SyncthingManager.swift:
- Around line 1743-1751: The current code ignores errors from
SyncBridgeService.removeConflictFilesForOriginal and
SyncBridgeService.rescanFolder and always returns success; change the logic so
you capture and propagate failures from both
SyncBridgeService.removeConflictFilesForOriginal and
SyncBridgeService.rescanFolder (e.g., check for a thrown error or a Result
value), only call refreshConflicts and return the removed list when both calls
succeed, and return the encountered error (or a mapped error) otherwise so
callers see cleanup/rescan failures instead of silent success.In
@ios/VaultSync/Views/ConflictDiffView.swift:
- Around line 209-220: skipThisFile currently calls
SyncthingManager.skipFileAndCleanupConflicts(...) synchronously on the UI
thread; move the heavy work into a background Task (e.g., Task.detached or Task
{ } with Task.checkCancellation points) that calls
SyncthingManager.skipFileAndCleanupConflicts(folderID:originalPath:), handles
cancellation, then marshals only UI updates back to the MainActor to set
skipErrorMessage, showSkipError, skipRemovedCount and showSkipConfirmation;
ensure any filesystem helpers like removeConflictFilesForOriginal(...) and
refreshConflicts() run off the main thread and that errors from
skipFileAndCleanupConflicts are captured and delivered to the MainActor for
presentation.In
@ios/VaultSync/Views/ContentView.swift:
- Around line 137-160: The reconnecting spinner and subtitle are shown whenever
isReconnecting is true, which can clash with higher-priority states reflected by
syncStatusText; update the UI to only show reconnecting visuals when both
isReconnecting is true and the current status precedence allows it (i.e., the
same guard used to decide/derive syncStatusText). Concretely, wrap the
spinner/Image selection and the VStack subtitle branch (currently using
isReconnecting and syncthingManager.reconnectingRequiredDeviceIDs) behind the
same precedence check/flag you use to compute syncStatusText (or a derived
boolean like showReconnectingUI) so that error/folder-issue states take priority
and suppress reconnecting visuals.
Nitpick comments:
In@docs/sync-filters-ux.md:
- Line 121: The fenced code block that contains the snippet starting with "⋯
menu" is missing a language identifier; update the opening fence for that block
(the fenced code block containing "⋯ menu" / "Always skip on this iPhone") to
use a plaintext language specifier such astext (orplaintext) so the
markdownlint warning is resolved while keeping the content unchanged.</details> <details> <summary>🪄 Autofix (Beta)</summary> Fix all unresolved CodeRabbit comments on this PR: - [ ] <!-- {"checkboxId": "4b0d0e0a-96d7-4f10-b296-3a18ea78f0b9"} --> Push a commit to this branch (recommended) - [ ] <!-- {"checkboxId": "ff5b1114-7d8c-49e6-8ac1-43f82af23a33"} --> Create a new PR with the fixes </details> --- <details> <summary>ℹ️ Review info</summary> <details> <summary>⚙️ Run configuration</summary> **Configuration used**: Repository UI **Review profile**: CHILL **Plan**: Pro Plus **Run ID**: `5ecbcaa0-5bd1-4a7a-9d4d-38ec5dbff41f` </details> <details> <summary>📥 Commits</summary> Reviewing files that changed from the base of the PR and between 4af820f36bc3d6c6c278a36cfa35d420fa575f89 and 3c64d426fa5fc061c6795856d2e1dcb033862a12. </details> <details> <summary>📒 Files selected for processing (18)</summary> * `.gitignore` * `CHANGELOG.md` * `README.md` * `docs/sync-filters-ux.md` * `go/bridge/conflicts.go` * `go/bridge/conflicts_test.go` * `ios/VaultSync/Models/SkipFamily.swift` * `ios/VaultSync/Services/SyncBridgeService.swift` * `ios/VaultSync/Services/SyncthingManager.swift` * `ios/VaultSync/Views/ConflictDiffView.swift` * `ios/VaultSync/Views/ContentView.swift` * `ios/VaultSync/Views/IgnorePatternsView.swift` * `ios/VaultSync/de.lproj/Localizable.strings` * `ios/VaultSync/en.lproj/Localizable.strings` * `ios/VaultSync/zh-Hans.lproj/Localizable.strings` * `ios/VaultSyncTests/ReconnectingGracePeriodTests.swift` * `ios/VaultSyncTests/SkipFamilyTests.swift` * `ios/project.yml` </details> </details> <details> <summary>📜 Review details</summary> <details> <summary>⏰ Context from checks skipped due to timeout of 900000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)</summary> * GitHub Check: Bridge Schema Regression </details> <details> <summary>🧰 Additional context used</summary> <details> <summary>📓 Path-based instructions (7)</summary> <details> <summary>**/*.swift</summary> **📄 CodeRabbit inference engine (Custom checks)** > For Swift background execution changes, pass if work is bounded, cancellation-aware, handles expiration callbacks, and records errors without leaking private vault data. Fail only when background work can continue unbounded, miss cleanup, or violate iOS background execution constraints. Files: - `ios/VaultSync/Services/SyncBridgeService.swift` - `ios/VaultSyncTests/ReconnectingGracePeriodTests.swift` - `ios/VaultSyncTests/SkipFamilyTests.swift` - `ios/VaultSync/Models/SkipFamily.swift` - `ios/VaultSync/Views/ContentView.swift` - `ios/VaultSync/Views/ConflictDiffView.swift` - `ios/VaultSync/Views/IgnorePatternsView.swift` - `ios/VaultSync/Services/SyncthingManager.swift` </details> <details> <summary>ios/**/*.swift</summary> **📄 CodeRabbit inference engine (README.md)** > Follow Swift API Design Guidelines > > Use Swift strict concurrency where applicable > > iOS background execution should use BGAppRefreshTask and BGContinuedProcessingTask where available > > Support VoiceOver and Dynamic Type accessibility throughout the app Files: - `ios/VaultSync/Services/SyncBridgeService.swift` - `ios/VaultSyncTests/ReconnectingGracePeriodTests.swift` - `ios/VaultSyncTests/SkipFamilyTests.swift` - `ios/VaultSync/Models/SkipFamily.swift` - `ios/VaultSync/Views/ContentView.swift` - `ios/VaultSync/Views/ConflictDiffView.swift` - `ios/VaultSync/Views/IgnorePatternsView.swift` - `ios/VaultSync/Services/SyncthingManager.swift` --- **⚙️ CodeRabbit configuration file** > `ios/**/*.swift`: Focus on Swift 6 strict concurrency, Sendable/MainActor correctness, Task cancellation, > retain cycles, memory pressure, SwiftUI observation state, StoreKit/APNs flows, and iOS background execution limits. > Pay special attention to BGAppRefreshTask and BGContinuedProcessingTask behavior, expiration handling, > bounded work, and cleanup when the app is suspended or terminated. Files: - `ios/VaultSync/Services/SyncBridgeService.swift` - `ios/VaultSyncTests/ReconnectingGracePeriodTests.swift` - `ios/VaultSyncTests/SkipFamilyTests.swift` - `ios/VaultSync/Models/SkipFamily.swift` - `ios/VaultSync/Views/ContentView.swift` - `ios/VaultSync/Views/ConflictDiffView.swift` - `ios/VaultSync/Views/IgnorePatternsView.swift` - `ios/VaultSync/Services/SyncthingManager.swift` </details> <details> <summary>**/*</summary> **⚙️ CodeRabbit configuration file** > `**/*`: VaultSync syncs private Obsidian notes through Syncthing. Treat data loss, > privacy leaks, security regressions, and broken sync behavior as high priority. > Do not nitpick formatting unless it affects maintainability, correctness, or public API clarity. > Flag any accidental logging, telemetry, crash reporting, or network transfer of note contents, > vault paths, filenames with private context, API keys, APNs tokens, relay keys, or security-scoped bookmark data. Files: - `ios/VaultSync/Services/SyncBridgeService.swift` - `ios/project.yml` - `README.md` - `ios/VaultSyncTests/ReconnectingGracePeriodTests.swift` - `ios/VaultSyncTests/SkipFamilyTests.swift` - `ios/VaultSync/en.lproj/Localizable.strings` - `docs/sync-filters-ux.md` - `ios/VaultSync/Models/SkipFamily.swift` - `go/bridge/conflicts.go` - `ios/VaultSync/de.lproj/Localizable.strings` - `ios/VaultSync/zh-Hans.lproj/Localizable.strings` - `go/bridge/conflicts_test.go` - `ios/VaultSync/Views/ContentView.swift` - `ios/VaultSync/Views/ConflictDiffView.swift` - `CHANGELOG.md` - `ios/VaultSync/Views/IgnorePatternsView.swift` - `ios/VaultSync/Services/SyncthingManager.swift` </details> <details> <summary>ios/project.yml</summary> **⚙️ CodeRabbit configuration file** > `ios/project.yml`: This generates the Xcode project and Info.plist. Review changes for bundle ID, > entitlements, background modes, URL schemes, signing settings, and accidental secret exposure. Files: - `ios/project.yml` </details> <details> <summary>**/*.md</summary> **⚙️ CodeRabbit configuration file** > `**/*.md`: Review public documentation for technical accuracy, privacy/security claims, App Store-facing wording, > setup correctness, and consistency with the free app plus optional Cloud Relay subscription model. Files: - `README.md` - `docs/sync-filters-ux.md` - `CHANGELOG.md` </details> <details> <summary>go/**/*.go</summary> **📄 CodeRabbit inference engine (README.md)** > Follow Standard Go conventions Files: - `go/bridge/conflicts.go` - `go/bridge/conflicts_test.go` </details> <details> <summary>go/bridge/**/*.go</summary> **⚙️ CodeRabbit configuration file** > `go/bridge/**/*.go`: This code crosses the gomobile Swift-Go boundary. Verify exported signatures use only gomobile-safe primitive types, > preserve the JSON string contract, keep empty-string success conventions intact, and avoid breaking Swift decoding tests. > Review Syncthing lifecycle, locking, error strings, and noassets build assumptions carefully. Files: - `go/bridge/conflicts.go` - `go/bridge/conflicts_test.go` </details> </details><details> <summary>🧠 Learnings (1)</summary> <details> <summary>📓 Common learnings</summary> ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:02.137Z Learning: Use Conventional Commits for commit messages ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:02.137Z Learning: Provide clear PR descriptions in pull requests ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:02.137Z Learning: Syncs Obsidian vaults directly into Obsidian's iOS sandbox via Syncthing protocol ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:02.137Z Learning: No note content, filenames, folder names, vault structure, or vault metadata should pass through Cloud Relay servers ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:02.137Z Learning: Implement Markdown conflict resolution with side-by-side diffs for conflicting files ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:14.167Z Learning: When a new folder is added, silently apply the Recommended preset set without showing the first-run sheet, to prevent workspace.json from generating immediate sync conflicts ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:14.167Z Learning: For users updating from previous builds, keep existing `.Trash`, `.obsidian/workspace.json`, and `.obsidian/workspace-mobile.json` patterns on disk untouched and automatically show them as ON in derived state without migrating data ``` ``` Learnt from: CR Repo: psimaker/vaultsync Timestamp: 2026-05-23T09:56:14.167Z Learning: Use consistent terminology throughout the app: 'Sync Filters' for section titles, 'Skip on this iPhone' or 'Always skip on this iPhone' for CTAs, and 'Choose what gets synced to this iPhone' for explanatory copy, avoiding jargon like 'ignore patterns', 'exclusions', or 'filter rules' ``` </details> </details><details> <summary>🪛 markdownlint-cli2 (0.22.1)</summary> <details> <summary>docs/sync-filters-ux.md</summary> [warning] 121-121: Fenced code blocks should have a language specified (MD040, fenced-code-language) </details> </details> </details> <details> <summary>🔇 Additional comments (16)</summary><blockquote> <details> <summary>ios/VaultSyncTests/ReconnectingGracePeriodTests.swift (1)</summary><blockquote> `4-143`: LGTM! </blockquote></details> <details> <summary>ios/VaultSync/Views/ContentView.swift (1)</summary><blockquote> `273-303`: LGTM! </blockquote></details> <details> <summary>.gitignore (1)</summary><blockquote> `48-48`: LGTM! </blockquote></details> <details> <summary>CHANGELOG.md (1)</summary><blockquote> `7-14`: LGTM! </blockquote></details> <details> <summary>README.md (1)</summary><blockquote> `102-105`: LGTM! </blockquote></details> <details> <summary>docs/sync-filters-ux.md (1)</summary><blockquote> `4-4`: LGTM! Also applies to: 119-142 </blockquote></details> <details> <summary>ios/project.yml (1)</summary><blockquote> `53-54`: LGTM! Also applies to: 103-104 </blockquote></details> <details> <summary>ios/VaultSync/Views/ConflictDiffView.swift (1)</summary><blockquote> `26-27`: LGTM! Also applies to: 182-197 </blockquote></details> <details> <summary>ios/VaultSync/Views/IgnorePatternsView.swift (1)</summary><blockquote> `80-89`: LGTM! Also applies to: 112-118, 189-197 </blockquote></details> <details> <summary>ios/VaultSync/de.lproj/Localizable.strings (1)</summary><blockquote> `330-332`: LGTM! Also applies to: 482-485 </blockquote></details> <details> <summary>ios/VaultSync/en.lproj/Localizable.strings (1)</summary><blockquote> `331-333`: LGTM! Also applies to: 483-486 </blockquote></details> <details> <summary>ios/VaultSync/zh-Hans.lproj/Localizable.strings (1)</summary><blockquote> `330-332`: LGTM! Also applies to: 482-485 </blockquote></details> <details> <summary>ios/VaultSyncTests/SkipFamilyTests.swift (1)</summary><blockquote> `8-103`: LGTM! </blockquote></details> <details> <summary>go/bridge/conflicts.go (1)</summary><blockquote> `260-343`: LGTM! </blockquote></details> <details> <summary>go/bridge/conflicts_test.go (1)</summary><blockquote> `345-512`: LGTM! </blockquote></details> <details> <summary>ios/VaultSync/Services/SyncBridgeService.swift (1)</summary><blockquote> `216-232`: LGTM! </blockquote></details> </blockquote></details> </details> <!-- This is an auto-generated comment by CodeRabbit for review status -->
If currentSyncError != nil OR !isRunning OR foldersWithErrors is non-empty,
the dashboard's syncStatusText already shows a higher-priority state
('Error', 'Starting…', 'Sync Issue'). The reconnecting spinner +
'Restoring connection to N device(s)' caption used to render anyway,
producing an incoherent row (e.g. red 'Error' text with a teal reconnect
spinner). shouldShowReconnectingUI mirrors the syncStatusText cascade so
the reconnecting visuals only appear when reconnecting is actually the
status being reported.
A user-added .stignore entry like '*.tmp' or 'drafts/' would, via
SyncthingManager.conflictGlob, produce a derived glob ('*.sync-conflict-*',
'drafts.sync-conflict-*') that could coincidentally match another manual
entry and produce a spurious pairing. The result would be swipe-delete
removing both unrelated patterns at once.
Add isConcreteFilePathPattern guard that excludes lines containing
glob metacharacters (*, ?, [], {}, !) or a trailing slash. Apply in
both the pre-pass and the main emission loop. Three new regression
tests cover '*.tmp', 'drafts/', and 'note?.md'.
…upConflicts Previously errors from removeConflictFilesForOriginal and rescanFolder were silently swallowed: the call returned success even when on-disk conflict copies couldn't be removed or the rescan failed. The user saw a 'Skipping enabled' alert while the conflict actually still surfaced on the home screen, with no signal what went wrong. Now both bridge errors are mapped to a SyncUserError and returned to the caller, so the existing 'Could not add filter' alert path surfaces a real message. The .stignore write still happens before the cleanup, so on partial failure the file is at least correctly ignored — the error message tells the user the leftover copies weren't removed.
…s immediately Honest scope note: this only wraps the call in a Task and returns the button handler synchronously. The underlying skipFileAndCleanupConflicts is still @MainActor-isolated (it touches manager state, refreshConflicts, etc.) so the file I/O continues to run on the main actor. A full move to a background executor would require splitting the bridge cleanup, rescan, and refresh paths into nonisolated entry points — out of scope for this PR. The Task wrapper is a non-regressing first step and makes that future refactor strictly easier.
Owner
Author
|
@coderabbitai review |
✅ Actions performedReview triggered.
|
Owner
Author
|
@coderabbitai resolve |
✅ Actions performedComments resolved. Approval is disabled; enable |
8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two independent fixes shipping together as v1.3.2 (build 24):
1. Skip-Family — closes #8 (reported by @vitaly74)
Tapping "Always skip on this iPhone" in the conflict resolver previously added only the original file's path to
.stignore, so a freshsync-conflict-…copy with a new timestamp would arrive from the desktop and the conflict reappeared. The Skip flow now:.stignore: the original path AND a<path>.sync-conflict-*glob2. Reconnecting Grace Period — internal UX polish
When VaultSync resumes after the app has been away from the foreground for a while, the home screen no longer briefly flashes a "1 Required Device Is Disconnected" warning while the embedded Syncthing process is still rebuilding its connection. Instead, the sync status reads "Reconnecting…" with a calm system spinner for up to 30 seconds, then either returns to "All Synced" or surfaces the existing warning if the peer is genuinely offline.
Implemented via per-device disconnect-timestamp tracking on
SyncthingManager, with a singleapplyDeviceList(_:)entry point that keeps the dictionary consistent with thedevicesarray.Changes
RemoveConflictFilesForOriginal(folderID, originalPath) -> JSONfor active conflict-copy cleanupSyncthingManager.conflictGlob(forOriginalPath:),skipFileAndCleanupConflicts(folderID:originalPath:), newSkipFamilyEntry/SkipFamilyGroupingtypes,disconnectedSincestate +reconnectingRequiredDeviceIDspropertyConflictDiffViewwired to new Skip flow,IgnorePatternsViewrenders paired entries as one row,ContentViewdashboard shows "Reconnecting…" withProgressViewspinnerTest plan
Automated
Manual smoke (verified on device)
v1.3.2: Skip-Family fix + Reconnecting grace period
This release addresses two issues affecting the sync experience:
Skip-Family fix (closes
#8)Resolves a bug where choosing "Always skip on this iPhone" only prevented the original file from syncing but allowed new conflict copies to reappear. The fix now:
<path>.sync-conflict-*glob pattern to.stignoreThis ensures that skipping a file truly eliminates it and all future conflict variants from syncing.
Reconnecting grace period (UX polish)
Prevents a transient "Required Device Is Disconnected" warning when the app returns to foreground while Syncthing rebuilds connections. The dashboard now displays "Reconnecting…" with a spinner for up to 30 seconds; after that period, it either returns to normal status or surfaces any genuine disconnection. Implemented via per-device disconnect-timestamp tracking in
SyncthingManager.Changes
RemoveConflictFilesForOriginal(folderID, originalPath)to delete matching*.sync-conflict-*filesconflictGlob,skipFileAndCleanupConflicts),SkipFamilyEntry/SkipFamilyGroupingtypes for pattern pairing, per-device disconnect tracking, and reconnecting status in dashboardRemoveConflictFilesForOriginal,conflictGlob,SkipFamilyGrouping.group(), and reconnect grace-period behavior