[vmiklos]

Fix: keep waypoint track id when restoring text note dialog

🛠️ Issue

• Closes Waypoints are missing after rotation #721

📖 Description

Add a text note, then let Android recreate the tracking screen
twice without opening the text note dialog in between, e.g. rotate
to landscape and back: notes added after that are saved, but their
waypoints are missing from the track and from the GPX export, because
they're created with a track id of 0.

It seems this went wrong in commit
3f86c52 (Feature: Use Text Note
preferences to save the note, 2026-01-18), the direct problem is that
TextNoteDialog.onSaveInstanceState() only saves the waypoint track id if
saveAsWayPoint is true, but that flag is only set in onStart(), once the
dialog is shown. The first recreation restores the dialog without
showing it, so the second recreation saves no track id at all, and then
onRestoreInstanceState() turns the missing key into 0. Notes are not
affected, since noteTrackId is never restored.

Fix the problem by always saving the waypoint track id. Also fall
back to the track id from the constructor in onRestoreInstanceState(),
in case the saved state has no track id.

✅ Pull Request Checklist

• The PR is proposed to the DEVELOP branch.
• The changes have been tested on my phone.
• An automated test have been added.
• There is a reference to the original ISSUE and related work.

📝 Additional Notes

Thanks for taking your time to review this.

[vmiklos]

@jamescr could you please approve this workflow, so I can see if CI is happy with the changes? I guess that's needed as this would be my first PR for the project. Thanks.

[jamescr]

Welcome to OSMTracker and thanks for contributing. The change is well-scoped and simplifies the review. I also appreciate that the PR includes a unit test that gives us confidence that the fix won't regress.

I hope this is the first of many contributions.