From ab26fe5f987449b5bed474d557c48a5f99d473ba Mon Sep 17 00:00:00 2001 From: Incido Developer Date: Thu, 17 Sep 2026 18:07:07 +1200 Subject: [PATCH] fix(release): v0.3.8.1 emergency rebuild, reinstall required Re-release v0.3.8.0 unchanged so the repaired pipeline can actually publish it: the v0.3.8.0 run was cancelled and never produced a release or APKs. The build ran on a runner with an empty keystore cache, so CI minted a NEW signing key: installs cannot be upgraded in place (signature conflict), and with allowBackup=false an uninstall takes the user's notes. The release notes, README, and in-app What's New now all lead with export-a-backup-first. Lockstep per Dev Plan 11.1: versionCode 33->34, versionName -> 0.3.8.1, APP_VERSION, README, PREVIOUS_HISTORY section, ReleaseNotes.RECENT (0.3.5.1 drops off the tail), Dev Plan 10 row. --- Incido Development Plan.txt | 1 + PREVIOUS_HISTORY.md | 21 ++++++++++ README.md | 10 ++++- app/build.gradle.kts | 29 +++++++------- .../compose/data/settings/ReleaseNotes.kt | 38 +++++++++++-------- .../compose/ui/settings/SettingsViewModel.kt | 2 +- 6 files changed, 69 insertions(+), 32 deletions(-) diff --git a/Incido Development Plan.txt b/Incido Development Plan.txt index 1ed045b..513a595 100644 --- a/Incido Development Plan.txt +++ b/Incido Development Plan.txt @@ -370,6 +370,7 @@ A short reference for AI assistants: | Version | Date | Notes | |---------|------|-------| +| 0.3.8.1 | 2026-09-17 | **Emergency hotfix — rebuild / re-release of v0.3.8.0. Zero app-code changes; release-pipeline fix only.** **1. Why.** The release job had been failing to publish reliably. `.gitea/workflows/release.yml` now addresses the Gitea API as `http://192.168.8.17:3000/api/v1/repos/nick/incido` (LAN, direct) instead of the Cloudflare-fronted `https://git.trevena.info/...`, which was the source of the mid-upload 524 origin timeouts that 4a28f4f could only retry around. **2. Signing key rotated — INSTALLED BUILDS CANNOT UPDATE IN PLACE.** The job ran on a runner whose `/var/lib/gitea-runner/work` cache held no `release.jks`, so the mint-if-absent branch (release.yml) generated a NEW certificate; Android rejects an APK whose signing cert differs from the installed one, so v0.3.8.1 must be uninstalled before it will install. Because `allowBackup="false"` (AndroidManifest) keeps notes out of Android's cloud/D2D restore, an uninstall DESTROYS the user's notes — so the release notes lead with "export a backup first" (Settings → Backup → Export, plus Settings → Security → Export encryption key when encryption is on), then uninstall → install → restore. **Follow-up worth doing:** copy the original `release.jks` onto the runner at `/var/lib/gitea-runner/work/release.jks` to restore in-place upgrades and stop the rotation; until then every release repeats this. **3. Lockstep (§11.1).** versionCode 33→34, versionName "0.3.8.0"→"0.3.8.1", SettingsViewModel.APP_VERSION bumped, README current-release line + reinstall warning, PREVIOUS_HISTORY.md section (feeds the release description + `Incido-0.3.8.1-changes.md` asset), and the in-app What's New dialog (ReleaseNotes.RECENT — v0.3.5.1 drops off the 5-entry tail). | | 0.3.8.0 | 2026-09-16 | **Feature release — task lists, shopping lists, hashtag-autocomplete fix** (closes §6.1 "Checklists / to-do items within notes" + "Grocery list with running price total"). **1. Note types.** New `NoteType` enum in `:core/domain` (TEXT / TASK_LIST / SHOPPING_LIST) carried by `Note.type` and an additive `NoteEntity.typeKey` Short column (ObjectBox auto-migrates; old rows = TEXT). List bodies persist as GitHub-flavoured `- [ ] item` lines (`Note.splitListContent` / `serializeListContent`), so content stays the single source of truth: full-text search, AES-GCM field encryption, share-into, the v0.2 inline checklist card summaries, and Trash all keep working untouched. **2. Task-list editor.** Checklist button next to the # tag button in the editor's bottom action row converts the note into editable rows (Checkbox + item text + remove, "+ Add item", first non-checkbox line kept as the title field); tapping the active button reverts to plain text. Active mode tints primary. Cards already showed "- [ ]" open/done counts; shopping cards now show a basket icon instead of the checkbox glyph. **3. Shopping list + running total.** Same mechanism with two structured fields per row: a read-only **quantity picker (1–9)** (`ExposedDropdownMenuBox` — no keyboard ever opens) and a **POS-style price field** (`KeyboardType.Number`; every digit typed is a cent — the field stores the RAW digits verbatim (e.g. `199` = $1.99) so mid-field cursor placement behaves like a normal text field and can never scramble the amount, with a non-editable `$` prefix; the total bar renders dollars). A sticky `ShoppingTotalBar` stays pinned above the rows — always visible, updated live — summing `qty × price` of CHECKED (= in-basket) items in **integer cents** (no binary-float drift). Storage puts both values in an explicit end-of-line marker `- [x] Eggs {q12 p2.40}`, so the PRODUCT TEXT IS NEVER SCANNED FOR NUMBERS ("Battery AA 3", "Poster 50 x 60" stay pure product names); hand-typed §6.1 shapes (`Milk 3.50`, `Eggs 12 x 2.40`) still import once into the structured fields on conversion (decimals required on the legacy forms to avoid exactly that ambiguity). Converting to a task list folds values back into plain text tokens (`Eggs 12 x 2.40`) so nothing is lost across mode switches. **4. Add-tag suggestions repaired.** The autocomplete collector in `NoteEditorViewModel.init` was `tagInputFlow.collect { pool.collect { … } }` over infinite ObjectBox callbackFlows — the outer lambda suspended in the inner collect forever, keystrokes never re-queried, and `openAddTagSheet()` zeroed the list, so the sheet only ever offered "+ Create". Rebuilt on `flatMapLatest` over `tagInputFlow` (sheet opens showing every existing tag most-used-first, filters live per keystroke). **5. Backups** round-trip the new type via defaulted `BackupNote.noteType` ("TEXT") — pre-v0.3.8.0 files import unchanged, `ignoreUnknownKeys` covers older readers; encrypted backups reuse the same shape. ViewModel: `isDirty` gains the type axis; list edits keep `content` synchronised with the row serialisation so save/preview/canSave gates need no changes. versionCode 32→33, versionName "0.3.7.1"→"0.3.8.0", SettingsViewModel.APP_VERSION bumped in lockstep. | | 0.3.7.1 | 2026-08-30 | **Maintenance release — UI polish + one bug fix.** **1. Editor top bar decluttered.** The Add/Edit `TopAppBar` carried six right-side actions (camera, attach, tag, favourite, save, overflow), which crowded the title on narrow screens. Camera / Attach file / Add tag move to a Keep-style bottom action row (hairline `HorizontalDivider` above it; rides above the nav bar / keyboard via the existing IME insets). The top bar is now back + "New note" / "Edit note" title (`maxLines = 1`, ellipsis) + favourite + save + overflow (Move to Trash when editing) — always fits, and matches the §5.2 spec. **2. Image-viewer false failure fixed.** `ImageViewerScreen` checked `bitmap == null` in a `LaunchedEffect` before the async load finished, so a "Couldn't decode image attachment" toast fired on every persisted image open. Replaced with a `loadFailed` state set only after the byte load / decode genuinely fails; the placeholder switches from "Loading…" to "Couldn't load image" (toast removed). **3. Search QoL.** The list search field auto-focuses on open (`FocusRequester` + `LaunchedEffect(state.isSearchActive)`) and gains a trailing clear (✕) button while the query is non-empty. **4. Drawer tag-list overflow fixed.** The scrollable "Recent tags" column in `IncidoDrawer` had no height cap, so long tag lists could overflow the sheet bottom; it now takes `weight(1f)` and scrolls within the remaining height. Dead `_ignored` workaround val removed. **5. Add-tag sheet autofocus.** The sheet's input field is focused on open so the keyboard is already up. Also small hygiene: unused `persistedBytes` param dropped from `AttachmentStrip`; fully-qualified `Spacer` / `Image` / `Column` / `Dispatchers` references replaced with imports. **6. New flat app icon.** `incido_flat_icon.png` (1024×1024, squircle + shield + pen nib, transparent corners) replaces the v0.3.3.8 artwork: LANCZOS-downscaled into `drawable-{mdpi…xxxhdpi}/ic_launcher_foreground.png` (108/162/216/324/432 px, full 108dp canvas — the artwork's fill colour matches the background layer so the squircle edges blend seamlessly) and legacy `mipmap-{mdpi…xxxhdpi}/ic_launcher{,_round}.png` (48/72/96/144/192 px); `ic_launcher_background` re-tinted `#010435` → `#352999`. versionCode 31→32, versionName "0.3.7.0"→"0.3.7.1", SettingsViewModel.APP_VERSION bumped in lockstep. | | 0.3.7.0 | 2026-08-20 | **Feature release — Trash / soft delete.** Deleting a note (long-press card → ⋮ menu → Delete, or the editor's delete action) now soft-deletes it instead of destroying it: the note is flagged as trashed and hidden from Home, Favorites, Untagged, tag views, and ordinary search. A new **Trash** entry in the nav drawer lists only soft-deleted notes; each Trash card's overflow menu exposes **Restore** (returns the note to its previous views) and **Delete permanently** (destroys the row + attachments for good). `NoteEntity` gains a `trashed` flag (additive schema, auto-migrated); `NoteFilter` gains a `Trash` case; the repository gains `moveToTrash` / `restoreFromTrash` / `deletePermanently`; the drawer, list, and editor ViewModels + screens wire the new actions. Backups round-trip the trashed state. No automatic purge window yet — permanent deletion is immediate (see §6.1 "Trash status" note). versionCode 30→31, versionName "0.3.6.3"→"0.3.7.0", SettingsViewModel.APP_VERSION bumped in lockstep. | diff --git a/PREVIOUS_HISTORY.md b/PREVIOUS_HISTORY.md index 78a1659..1628b89 100644 --- a/PREVIOUS_HISTORY.md +++ b/PREVIOUS_HISTORY.md @@ -18,6 +18,27 @@ the release falls back to a plain "Release " description. --- +## v0.3.8.1 — 2026-09-17 + +> **⚠️ Reinstall required — please export a backup first.** This build is signed +> with a **new CI signing key** (the previous key lived in the old build runner's +> cache and was not carried over), so Android will refuse to install it over an +> existing Incido — it reports a signature conflict. Incido deliberately doesn't +> participate in Android's automatic backup/restore, so **uninstalling deletes +> your notes**. To update safely: **Settings → Backup → Export** (and +> **Settings → Security → Export encryption key** if you use encryption), +> then uninstall Incido, install this APK, and restore from your backup. +> If you'd rather keep using v0.3.8.0, that's fine — nothing in it is broken. + +- **No app changes.** v0.3.8.1 is a re-release of v0.3.8.0: same task lists, + shopping lists with the running total, and add-tag suggestions fix. Only the + build number and the release pipeline changed. +- **Why the rebuild.** The release pipeline had been failing to publish builds + reliably. Release uploads now go to the Gitea API over the local network + instead of the proxied public address, which is where the upload timeouts were + coming from — so this is the first build in a while to ship with its APKs and + notes attached the way §11.1 intends. + ## v0.3.8.0 — 2026-09-16 - **Task lists + shopping lists (Development Plan §6.1).** New checklist button in the editor's bottom action row (next to the `#` tag button) converts any note into an editable task list — real checkboxes, add / remove item rows; tap the button again to return to plain text (`NoteType`, additive `typeKey` column, auto-migrated). New shopping-basket button works the same way but gives every row a tap-to-pick **quantity (1–9) dropdown** and a supermarket-style price field where the number pad types cents — enter `199` and it counts as **$1.99** in the maths (the price box keeps exactly the digits you typed, so cursor placement can never scramble them, while the total bar speaks real dollars). An always-visible running total sits above the list, adding quantity × price for everything checked (= in the basket). The three values are strictly separate fields saved with an explicit end-of-line marker (`- [x] Eggs {q12 p2.40}`), so numbers inside a product name (like "Battery AA 3") can never leak into the money maths; hand-typed classic lines (`Milk 3.50`, `Eggs 12 x 2.40`) are still recognised when converting older notes. Lists persist as GitHub-flavoured `- [ ]` lines, so search, encryption, backups (new defaulted `noteType` field — old files still import), and card "N open · M done" summaries keep working; shopping cards show a basket icon. diff --git a/README.md b/README.md index 0cc9104..0239e8d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Incido is a privacy-first, on-device note-taking application for Android. All data stays on your device by default — no accounts, no cloud, no trackers. -This repository contains the **v0.3.8.0** release: a single-user, offline +This repository contains the **v0.3.8.1** release: a single-user, offline note app with hashtags, favourites, task lists, shopping lists with a running total, colour-coded notes, photo and file attachments, share-into from other apps and the @@ -17,9 +17,15 @@ device migrations. The architecture is multi-module Android today and is structured so iOS / Desktop ports can happen later without UI rewrites. -**Current release:** v0.3.8.0 — full release notes ship **on its entry on +**Current release:** v0.3.8.1 — full release notes ship **on its entry on the [Releases page](https://git.trevena.info/nick/incido/releases)**. +> **v0.3.8.1 needs a clean reinstall** (a new CI signing key makes it conflict +> with any existing Incido install). **Export a backup from +> Settings → Backup first** — Incido doesn't use Android's automatic backup, so +> uninstalling deletes your notes. Otherwise this build is identical to +> v0.3.8.0. + > **Version scheme (from v0.3.0.0 onwards):** `MAJOR.MINOR.MAINTENANCE.EMERGENCY` — > e.g. `0.3.0.0`. `MAJOR.MINOR.MAINTENANCE` are normal release numbers; > `EMERGENCY` is non-zero only for hotfixes shipped out-of-band. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1a237ce..62e272b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -28,19 +28,22 @@ android { applicationId = "org.incido.app" minSdk = 26 targetSdk = 35 - // v0.3.8.0: feature release — task lists, shopping lists, hashtag fix. - // - Task-list note type: bottom-bar toggle converts the body into - // an editable checklist (checkbox + text rows, add / remove). - // - Shopping-list note type: like the task list plus a number-pad - // Cost field per item and a sticky running total of the checked - // (= in-basket) items (Development Plan §6.1). - // - Hashtag sheet now shows live-filtered suggestions again (the - // nested-collect autocomplete pipeline was stuck; flatMapLatest). - // - NoteEntity gains `typeKey` (additive, auto-migrated); backups - // round-trip `noteType` with a "TEXT" default for old files. - // - versionCode monotonic +1 from v0.3.7.1 (32). - versionCode = 33 - versionName = "0.3.8.0" + // v0.3.8.1: EMERGENCY hotfix — re-release of v0.3.8.0 with NO app-code + // changes (EMERGENCY slot non-zero = out-of-band hotfix). + // - Why: the release pipeline kept failing to publish builds. The + // release job now talks to the Gitea API over the LAN + // (http://192.168.8.17:3000) instead of the Cloudflare-fronted + // public address, which is where the upload timeouts came from. + // - The build ran on a runner whose toolchain/keystore cache was + // empty, so CI minted a NEW signing key (release.yml mints one + // when /var/lib/gitea-runner/work/release.jks is absent). Existing + // installs therefore CANNOT be upgraded in place — Android refuses + // the APK as a signature conflict, so users must export a backup, + // uninstall, and reinstall (allowBackup=false, so an uninstall + // takes their notes with it). Warning shipped in the release notes. + // - versionCode monotonic +1 from v0.3.8.0 (33). + versionCode = 34 + versionName = "0.3.8.1" } // --- Signing --- diff --git a/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt b/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt index 0068938..4e40d7f 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/data/settings/ReleaseNotes.kt @@ -25,6 +25,27 @@ object ReleaseNotes { * Append a new entry on top each release. */ val RECENT: List = listOf( + ReleaseNote( + version = "0.3.8.1", + date = "2026-09-17", + bullets = listOf( + "Read this first \u2014 reinstall required. This build is signed " + + "with a new CI key (the previous key lived in the old build " + + "runner's cache and wasn't carried over), so Android refuses " + + "to install it over an existing Incido: it reports a " + + "signature conflict.", + "Export a backup BEFORE uninstalling: Settings \u2192 Backup " + + "\u2192 Export, plus Settings \u2192 Security \u2192 Export " + + "encryption key if you use encryption. Incido doesn't use " + + "Android's automatic backup, so uninstalling deletes your " + + "notes. Then install this APK and restore from that backup.", + "Nothing else changed: v0.3.8.1 is a re-release of v0.3.8.0 " + + "with the same task lists, shopping lists with the running " + + "total, and add-tag suggestions fix. The rebuild exists " + + "because the release pipeline had been failing to publish " + + "builds reliably; staying on v0.3.8.0 is perfectly fine.", + ), + ), ReleaseNote( version = "0.3.8.0", date = "2026-09-16", @@ -102,21 +123,6 @@ object ReleaseNotes { "replaced.", ), ), - ReleaseNote( - version = "0.3.5.1", - date = "2026-08-17", - bullets = listOf( - "Cards now update their \"Encrypted\" indicator the moment " + - "you flip the Encrypt-at-rest switch on — no need to " + - "toggle off+on or restart the app to see the badge " + - "appear.", - "The \"Encrypted\" indicator on each note card is now " + - "just a small lock icon, sitting immediately to the " + - "left of the date/time on the bottom row (consistent " + - "position on every card, instead of a centred \"lock + " + - "label\" group at the bottom of the card).", - ), - ), - // v0.3.8.0 push drops v0.3.5.0 off the "5 most recent" tail. + // v0.3.8.1 push drops v0.3.5.1 off the "5 most recent" tail. ) } diff --git a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt b/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt index e50e374..2502570 100644 --- a/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt +++ b/composeApp/src/main/kotlin/org/incido/compose/ui/settings/SettingsViewModel.kt @@ -333,7 +333,7 @@ class SettingsViewModel( /** The version string baked into backup payloads and shown on * the About card. Mirrors `app/build.gradle.kts` `versionName` * — if you bump one, bump both. */ - const val APP_VERSION = "0.3.8.0" + const val APP_VERSION = "0.3.8.1" val Factory: ViewModelProvider.Factory = viewModelFactory { initializer {