From 151bfda5d4c567ff909a61dc9c90bf8eece1db37 Mon Sep 17 00:00:00 2001 From: cirakg Date: Tue, 20 Oct 2026 18:36:54 +0200 Subject: feat(settings): add the Add OTP, Add code and Manage entry forms with a PIN queue for locked entries The full phone settings form (README 10.2) and its processing (10.3) as one resumable job: Import, Add OTP, Add code, Manage, then the About fields. Forms are applied only when their switch is on, cleared afterwards (secret first; only the secret after a problem), deduplicated by keyed hash, and report into their Result field and the results screen. - Add OTP validates per README 10.4; Add code runs the real encoder (CodeCheck, a job for 2D codes) and caches 2D codes on the way in. - Manage entry: edit, move, require/drop PIN, replace, counter, delete. Changes to locked entries are sealed under "q" and applied only after the PIN is entered under "Phone changes" in the menu. - About: catalog (800 characters max), version, storage use. - "Encrypt names" now applies to new and existing entries. Co-Authored-By: Claude Opus 5.5 --- source/ui/QueueMenu.mc | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 source/ui/QueueMenu.mc (limited to 'source/ui/QueueMenu.mc') diff --git a/source/ui/QueueMenu.mc b/source/ui/QueueMenu.mc new file mode 100644 index 0000000..880ca7c --- /dev/null +++ b/source/ui/QueueMenu.mc @@ -0,0 +1,91 @@ +// Author: cirakg & claude ai +// Summary: "Phone changes": lists the changes to locked entries waiting for the PIN, and confirms or rejects them (README 7.9). +// +// Confirming always asks for the PIN, even while the watch is unlocked: +// the point is that a person at the watch agrees, not that a key is +// available. (Before any PIN exists only "Require PIN" can wait here, and +// confirming creates the PIN.) The changes are then applied by a +// ChangeQueueJob on a timer and the results screen shows what happened. + +import Toybox.Lang; +import Toybox.WatchUi; + +module QueueMenu { + + function build() as WatchUi.Menu2 { + var vault = AppState.theVault(); + var menu = new WatchUi.Menu2({:title => "Phone changes"}); + menu.addItem(new WatchUi.MenuItem("Confirm all", vault.hasPin() ? "Asks for your PIN" : "Sets a PIN first", :confirm, null)); + menu.addItem(new WatchUi.MenuItem("Reject all", null, :reject, null)); + var items = ChangeQueue.descriptions(vault); + for (var i = 0; i < items.size(); i++) { + menu.addItem(new WatchUi.MenuItem(items[i], null, i, null)); + } + return menu; + } +} + +class QueueMenuDelegate extends WatchUi.Menu2InputDelegate { + + function initialize() { + Menu2InputDelegate.initialize(); + } + + function onSelect(item as WatchUi.MenuItem) as Void { + AppState.activity(); + var id = item.getId(); + var vault = AppState.theVault(); + if (id == :confirm) { + var then = new ApplyQueueAfterPin(); + var mode = vault.hasPin() ? PinView.MODE_UNLOCK : PinView.MODE_CREATE; + WatchUi.switchToView(new PinView(mode, then.method(:run)), new PinDelegate(), WatchUi.SLIDE_LEFT); + } else if (id == :reject) { + var lines = ["Rejected these changes from the phone:"] as Array; + lines.addAll(ChangeQueue.descriptions(vault)); + ChangeQueue.clear(vault); + Results.save(lines); + WatchUi.switchToView(new InfoView("Results", lines, "results"), new InfoDelegate(), WatchUi.SLIDE_LEFT); + Results.markSeen(); + AppState.processSettings(); // the About fields mention waiting changes + } else if (id instanceof Number) { + // The full text of one change (menu labels are cut short). + var items = ChangeQueue.descriptions(vault); + if (id < items.size()) { + WatchUi.pushView(new InfoView("Change", [items[id]] as Array, "change"), new InfoDelegate(), + WatchUi.SLIDE_LEFT); + } + } + } +} + +// After the PIN: apply the waiting changes, then show what happened. +class ApplyQueueAfterPin { + + // The job's timer driver (kept so it isn't collected while it runs). + var runner as Jobs.JobRunner? = null; + private var _job as ChangeQueueJob? = null; + + function initialize() { + } + + function run() as Void { + var job = new ChangeQueueJob(AppState.theVault()); + _job = job; + WatchUi.switchToView(new InfoView("Results", ["Applying the changes…"] as Array, "applying"), new InfoDelegate(), + WatchUi.SLIDE_LEFT); + var r = new Jobs.JobRunner(job, 1, method(:onDone)); + runner = r; + r.start(); + } + + function onDone() as Void { + var job = _job as ChangeQueueJob; + _job = null; + runner = null; + AppState.theCodes().clear(); + Results.save(job.lines); + WatchUi.switchToView(new InfoView("Results", job.lines, "results"), new InfoDelegate(), WatchUi.SLIDE_IMMEDIATE); + Results.markSeen(); + AppState.processSettings(); // refresh the catalog on the phone + } +} -- cgit v1.2.3