Skip to content

fix(sync): keep typed recovery words out of saved state - #1843

Open
A-EDev wants to merge 1 commit into
mainfrom
fix/sync2-words-out-of-saved-state
Open

A-EDev wants to merge 1 commit into
mainfrom
fix/sync2-words-out-of-saved-state

Conversation

@A-EDev

@A-EDev A-EDev commented Nov 7, 2026

Copy link
Copy Markdown
Collaborator

Summary

The recovery words typed into the restore forms and the two words typed back after setup used rememberSaveable, which copies the value into saved instance state and outlives the process. All three now use remember, so they stay in memory only. Anything typed there is cleared if Android closes the app in the background. The activity handles rotation itself, so rotating keeps them.

  • LinkedSetup.kt: the words in both restore forms, server and WebDAV. The addresses are still kept.
  • LinkedRecoveryWords.kt: the answers when asked for words back. Which positions it asks for stays saved; those are numbers, not words.

No file under sync2/ uses saved state, and nothing in ui/screens/sync/ uses SavedStateHandle.

Related issue

None.

Change type

  • Bug fix
  • Feature
  • Refactor or maintenance
  • Build, packaging, or CI
  • Documentation

Validation

All Gradle commands ran with --offline -Dorg.gradle.jvmargs="-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8 -Djava.net.preferIPv6Addresses=true".

  • :app:testGithubDebugUnitTest --tests 'io.github.aedev.flow.sync2.*' --tests 'io.github.aedev.flow.ui.screens.sync.*': 309 tests, 0 failed.

  • ktlintCheck: exit 0.

  • python3 .github/scripts/nightly_notes.py --check: exit 0.

  • Three new tests use StateRestorationTester, the same way as the admin token tests in fix(sync): keep a typed admin token out of saved state #1835. All three failed with rememberSaveable before the change and pass now.

  • ./gradlew :app:assembleGithubDebug: not run locally, CI builds it.

  • ./gradlew :app:testGithubDebugUnitTest: full suite not run locally, CI runs it.

  • I ran any additional flavor-specific build or test tasks affected by this change.

  • I manually tested the affected behavior on an Android device or emulator: not done.

Test device and Android version: none. The tests emulate a saved state restore; no process was killed on a device.

Risk and compatibility

Someone who leaves a restore form and comes back after Android closed the app types the words again. LinkedSetupTest takes the same Content() helper as #1835. A local merge with either #1835 or #1831 conflicts in that test file only, and keeping both sides resolves it; with #1831 the helper also takes its new parameters.

  • The change does not introduce secrets, private data, or unexpected telemetry.
  • New user-facing text uses Android string resources. (No new app strings; the nightly note is the only new text.)
  • Dependency and lockfile changes are intentional and limited to this PR.
  • Room schema changes include the required version bump and migration, or this PR does not change the Room schema.
  • Breaking changes and upgrade steps are clearly documented. (None.)

Copilot AI balanced review requested due to automatic review settings November 7, 2026 17:28

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing.

@github-actions github-actions Bot added documentation Improvements or additions to documentation ui Compose UI, theming, or Material 3 surfaces labels Nov 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation ui Compose UI, theming, or Material 3 surfaces

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants