Skip to content

iPhone 1.37.0 build 58: a fresh install no longer conflicts with its own Welcome note - #90

Merged
adibhanna merged 2 commits into
mainfrom
release/1.37.0-b58
Nov 3, 2026
Merged

adibhanna merged 2 commits into
mainfrom
release/1.37.0-b58

Conversation

@adibhanna

Copy link
Copy Markdown
Contributor

iPhone 1.37.0 build 58, replacing build 57 before Apple reviews it. Adds one fix.

A fresh install that links to a Cloud vault no longer stops on its own Welcome note. On a vault's first sync, a Welcome note that still matches a text the app once wrote is held back: it takes Cloud's copy if there is one, and uploads as a new note if not. An edited note still raises the conflict. An install already showing the conflict keeps it until the person reviews it.

Verified with a whole fresh install against a fake Cloud on an iOS 27.2 simulator and on Android: older seed, edited Cloud copy, edited local note, no Cloud copy. Not run: real Cloud on this exact case (the QA vault's copy was cleared), end-to-end encrypted, iCloud and external folder vaults, physical devices, and interrupted syncs.

…note

A new install seeds inbox/Welcome to ZenNotes.md, and linking it to a Cloud
vault that already holds that note stopped on "1 file needs review" and paused
the file. Neither copy had been edited: the seed text changes between versions,
and on a first sync core has no history to tell which copy is newer.

The first sync now holds back a seed whose bytes still match a text a phone has
seeded, so core sees no local file to conflict with. If Cloud has the note, its
copy replaces the seed and is never overwritten. If not, the seed goes up as a
new note on the same run's next scan, as it did before.

A note the person edited still raises the conflict, since losing their words is
worse than a prompt. The seed is replaced only through the usual checked write,
against the bytes scanned, so an edit made during the sync conflicts too. If the
sync state cannot be read the note stays in the scan, because a tracked note
missing from a scan would go up as a deletion.

The hash list holds all 11 seed texts from both phone apps. A test fails if the
seed changes without its hash joining the list.

An install already holding this conflict keeps it until the person reviews it.
@adibhanna
adibhanna merged commit 0e9ed5b into main Nov 3, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant