Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c73cd4c816 | ||
|
|
b95d1814f9 |
No files matched your search
@@ -49,7 +49,25 @@ jobs:
|
|||||||
echo "ANDROID_SDK_ROOT=$SDK" >> $GITHUB_ENV
|
echo "ANDROID_SDK_ROOT=$SDK" >> $GITHUB_ENV
|
||||||
echo "PATH=$SDK/cmdline-tools/latest/bin:$SDK/platform-tools:$PATH" >> $GITHUB_ENV
|
echo "PATH=$SDK/cmdline-tools/latest/bin:$SDK/platform-tools:$PATH" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Build release APK
|
# The release signing config in app/build.gradle.kts only attaches a
|
||||||
|
# storeFile when keystore/release.jks exists, and that .jks is
|
||||||
|
# gitignored -- so the CI runner must mint its own. We use the exact
|
||||||
|
# dev keystore documented in keystore/README.md (alias "incido",
|
||||||
|
# both passwords "incido_dev_keystore"). Move to a Gitea Actions
|
||||||
|
# secret + production keystore before publishing to Play / F-Droid.
|
||||||
|
- name: Generate dev release keystore
|
||||||
|
run: |
|
||||||
|
cd repo
|
||||||
|
mkdir -p keystore
|
||||||
|
keytool -genkey -noprompt -v \
|
||||||
|
-keystore keystore/release.jks \
|
||||||
|
-keyalg RSA -keysize 2048 -validity 10000 \
|
||||||
|
-alias incido \
|
||||||
|
-storepass incido_dev_keystore \
|
||||||
|
-keypass incido_dev_keystore \
|
||||||
|
-dname "CN=Incido Dev, OU=Local, O=Incido, L=Local, ST=Local, C=NZ"
|
||||||
|
|
||||||
|
- name: Build debug + release APKs
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
@@ -60,17 +78,23 @@ jobs:
|
|||||||
export ANDROID_HOME=/tmp/gitea-runner-work/android-sdk
|
export ANDROID_HOME=/tmp/gitea-runner-work/android-sdk
|
||||||
export PATH=$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH
|
export PATH=$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH
|
||||||
|
|
||||||
# Build release APK
|
# Build both variants; copyReleaseApks finalizes assembleRelease and
|
||||||
./gradlew assembleRelease --no-daemon
|
# drops version-stamped APKs at the repo root:
|
||||||
|
# Incido-<version>-debug.apk
|
||||||
|
# Incido-<version>-release.apk
|
||||||
|
./gradlew assembleDebug assembleRelease --no-daemon
|
||||||
|
|
||||||
# Find the APK
|
# Verify both files exist before proceeding
|
||||||
TAG="${GITHUB_REF##*/}"
|
TAG="${GITHUB_REF##*/}"
|
||||||
APK=$(find app/build/outputs -name '*.apk' | head -1)
|
|
||||||
echo "APK_PATH=$APK" >> $GITHUB_ENV
|
|
||||||
echo "APK_NAME=$(basename $APK)" >> $GITHUB_ENV
|
|
||||||
echo "Built APK: $APK"
|
|
||||||
|
|
||||||
# Create release and attach APK in one step
|
- name: Create release + attach both APKs
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.TOKEN }}
|
||||||
|
run: |
|
||||||
|
cd repo
|
||||||
|
TAG="${GITHUB_REF##*/}"
|
||||||
|
VERSION="${TAG#v}"
|
||||||
|
|
||||||
echo "Creating release for tag: $TAG"
|
echo "Creating release for tag: $TAG"
|
||||||
RELEASE_ID=$(curl -s -X POST "https://git.trevena.info/api/v1/repos/nick/incido/releases" \
|
RELEASE_ID=$(curl -s -X POST "https://git.trevena.info/api/v1/repos/nick/incido/releases" \
|
||||||
-H "Authorization: token $GITHUB_TOKEN" \
|
-H "Authorization: token $GITHUB_TOKEN" \
|
||||||
@@ -83,12 +107,17 @@ jobs:
|
|||||||
}" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id','') or '')")
|
}" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id','') or '')")
|
||||||
echo "Release ID: $RELEASE_ID"
|
echo "Release ID: $RELEASE_ID"
|
||||||
|
|
||||||
if [ -n "$RELEASE_ID" ] && [ -f "$APK" ]; then
|
if [ -z "$RELEASE_ID" ]; then
|
||||||
curl -s -X POST "https://git.trevena.info/api/v1/repos/nick/incido/releases/$RELEASE_ID/assets?name=$(basename $APK)" \
|
echo "ERROR: Failed to create release"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
for APK in "Incido-${VERSION}-debug.apk" "Incido-${VERSION}-release.apk"; do
|
||||||
|
echo "Attaching $APK to release $RELEASE_ID"
|
||||||
|
RESPONSE=$(curl -s -X POST \
|
||||||
|
"https://git.trevena.info/api/v1/repos/nick/incido/releases/$RELEASE_ID/assets?name=$APK" \
|
||||||
-H "Authorization: token $GITHUB_TOKEN" \
|
-H "Authorization: token $GITHUB_TOKEN" \
|
||||||
-H "Content-Type: application/octet-stream" \
|
-H "Content-Type: application/octet-stream" \
|
||||||
--data-binary "@$APK"
|
--data-binary "@$APK")
|
||||||
echo "APK $(basename $APK) attached to release $TAG"
|
echo "Attach response: $RESPONSE"
|
||||||
else
|
done
|
||||||
echo "WARNING: Could not attach APK (release_id=$RELEASE_ID, apk_exists=$(test -f '$APK' && echo yes || echo no))"
|
|
||||||
fi
|
|
||||||
@@ -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
|
All data stays on your device by default — no accounts, no cloud, no
|
||||||
trackers.
|
trackers.
|
||||||
|
|
||||||
This repository contains the **v0.3.6.1** release: a single-user, offline
|
This repository contains the **v0.3.6.3** release: a single-user, offline
|
||||||
note app with hashtags, favourites, full-text search, colour-coded
|
note app with hashtags, favourites, full-text search, colour-coded
|
||||||
notes, photo and file attachments, share-into from other apps and the
|
notes, photo and file attachments, share-into from other apps and the
|
||||||
web, at-rest AES-256-GCM encryption with screenshot blocking, PIN /
|
web, at-rest AES-256-GCM encryption with screenshot blocking, PIN /
|
||||||
@@ -15,7 +15,7 @@ encryption key for device migrations. The architecture is multi-module
|
|||||||
Android today and is structured so iOS / Desktop ports can happen later
|
Android today and is structured so iOS / Desktop ports can happen later
|
||||||
without UI rewrites.
|
without UI rewrites.
|
||||||
|
|
||||||
**Current release:** v0.3.6.1 (see [Changelog](#changelog) below).
|
**Current release:** v0.3.6.3 (see [Changelog](#changelog) below).
|
||||||
|
|
||||||
> **Version scheme (from v0.3.0.0 onwards):** `MAJOR.MINOR.MAINTENANCE.EMERGENCY` —
|
> **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;
|
> e.g. `0.3.0.0`. `MAJOR.MINOR.MAINTENANCE` are normal release numbers;
|
||||||
@@ -106,6 +106,7 @@ cross-platform ports, end-to-end sync, and security features.
|
|||||||
|
|
||||||
| Version | Date | Highlights |
|
| Version | Date | Highlights |
|
||||||
|-----------|------------|------------|
|
|-----------|------------|------------|
|
||||||
|
| 0.3.6.3 | 2026-08-20 | **Missing-keystore failure is now actionable on a fresh clone.** `./gradlew assembleRelease` now fails at configuration time with a clear `GradleException` quoting the exact `keytool` command from `keystore/README.md` if `keystore/release.jks` is missing, instead of dying much later inside `packageRelease` with the cryptic `SigningConfig "release" is missing required property "storeFile"`. CI is unchanged: `.gitea/workflows/release.yml` already mints the dev keystore on the runner before `assembleRelease`. |
|
||||||
| 0.3.6.1 | 2026-08-19 | **Editor top-bar title is now left-aligned.** On the New / Edit screen the title ("New" / "Edit") now sits next to the back arrow, away from the six action icons that crowd the right edge — it was previously centred via `CenterAlignedTopAppBar` and visually pushed toward the action cluster. **Colour picker is now symmetric between the title bar and the note top.** The picker is flanked by 12dp gaps above and below (was 4dp top + 4dp bottom) so the visual distance to the title bar matches the distance to the `OutlinedTextField`'s top edge, instead of being dwarfed by the field's intrinsic top inset. |
|
| 0.3.6.1 | 2026-08-19 | **Editor top-bar title is now left-aligned.** On the New / Edit screen the title ("New" / "Edit") now sits next to the back arrow, away from the six action icons that crowd the right edge — it was previously centred via `CenterAlignedTopAppBar` and visually pushed toward the action cluster. **Colour picker is now symmetric between the title bar and the note top.** The picker is flanked by 12dp gaps above and below (was 4dp top + 4dp bottom) so the visual distance to the title bar matches the distance to the `OutlinedTextField`'s top edge, instead of being dwarfed by the field's intrinsic top inset. |
|
||||||
| 0.3.6.0 | 2026-08-19 | **Share webpages to Incido.** Sharing a page from your browser (Share → Incido) now creates a note with the page title on the first line and the URL below — fully offline (the title comes from the browser's share data, Incido never touches the network). **Export encryption key.** Settings → Security gains "Export encryption key" — saves the AES-256 key that protects your encrypted notes to a passphrase-protected `.inckey` file for device migrations. **Import encryption key** restores that key on a fresh install, with a clear warning before the current key is replaced. |
|
| 0.3.6.0 | 2026-08-19 | **Share webpages to Incido.** Sharing a page from your browser (Share → Incido) now creates a note with the page title on the first line and the URL below — fully offline (the title comes from the browser's share data, Incido never touches the network). **Export encryption key.** Settings → Security gains "Export encryption key" — saves the AES-256 key that protects your encrypted notes to a passphrase-protected `.inckey` file for device migrations. **Import encryption key** restores that key on a fresh install, with a clear warning before the current key is replaced. |
|
||||||
| 0.3.5.1 | 2026-08-17 | **"Encrypted" badge now appears the moment you flip the switch.** A race in `EncryptionVerifier.checkNow()` could silently drop the post-migration verification, leaving cards without the badge until a second toggle; replaced with a serializing Mutex so every check runs in invocation order. **"Encrypted" indicator is now a single lock icon next to the date** — consistent position on every card instead of a centred "lock + label" group at the bottom. |
|
| 0.3.5.1 | 2026-08-17 | **"Encrypted" badge now appears the moment you flip the switch.** A race in `EncryptionVerifier.checkNow()` could silently drop the post-migration verification, leaving cards without the badge until a second toggle; replaced with a serializing Mutex so every check runs in invocation order. **"Encrypted" indicator is now a single lock icon next to the date** — consistent position on every card instead of a centred "lock + label" group at the bottom. |
|
||||||
|
|||||||
+45
-20
@@ -28,29 +28,54 @@ android {
|
|||||||
applicationId = "org.incido.app"
|
applicationId = "org.incido.app"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 35
|
targetSdk = 35
|
||||||
// v0.3.6.1: Emergency hotfix — editor screen UX.
|
// v0.3.6.3: Local-dev DX — make the missing-keystore failure
|
||||||
// - Title in the editor's top bar now sits against the back
|
// mode actionable.
|
||||||
// arrow on the LEFT (was centred and crowding the six
|
// - signingConfigs.release now throws GradleException at
|
||||||
// right-side action buttons).
|
// config time when keystore/release.jks is missing, with
|
||||||
// - Note colour chooser is now equally spaced between the
|
// the exact keytool incantation from keystore/README.md
|
||||||
// title bar and the top edge of the note content (was
|
// in the error message. Previously the signing config
|
||||||
// dwarfed by the OutlinedTextField's intrinsic top inset,
|
// silently fell through with no storeFile, and packageRelease
|
||||||
// making the lower gap appear far larger).
|
// failed much later with the cryptic "SigningConfig release
|
||||||
// versionCode monotonic +1 from v0.3.6.0 (27).
|
// is missing required property storeFile" — leaving devs
|
||||||
versionCode = 28
|
// guessing at the cause.
|
||||||
versionName = "0.3.6.1"
|
// - .gitea/workflows/release.yml already mints the keystore
|
||||||
|
// on release runners (since v0.3.6.2), so CI is unaffected.
|
||||||
|
// - No app/Compose code changes.
|
||||||
|
// - versionCode monotonic +1 from v0.3.6.2 (29).
|
||||||
|
versionCode = 30
|
||||||
|
versionName = "0.3.6.3"
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Signing ---
|
// --- Signing ---
|
||||||
|
// v0.3.6.3: Fail fast (at config time) with an actionable error
|
||||||
|
// when keystore/release.jks is missing, rather than silently
|
||||||
|
// letting packageRelease die later with the cryptic "SigningConfig
|
||||||
|
// release is missing required property storeFile". CI (see
|
||||||
|
// .gitea/workflows/release.yml) already mints the keystore before
|
||||||
|
// assembleRelease (since v0.3.6.2), so this branch never fires on
|
||||||
|
// a release runner — only on a fresh local clone.
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
create("release") {
|
create("release") {
|
||||||
val keystoreFilePath = rootProject.file("keystore/release.jks")
|
val keystoreFilePath = rootProject.file("keystore/release.jks")
|
||||||
if (keystoreFilePath.exists()) {
|
if (!keystoreFilePath.exists()) {
|
||||||
storeFile = keystoreFilePath
|
throw GradleException(
|
||||||
storePassword = "incido_dev_keystore"
|
"Missing ${keystoreFilePath.absolutePath}.\n" +
|
||||||
keyAlias = "incido"
|
"Generate the dev keystore documented in " +
|
||||||
keyPassword = "incido_dev_keystore"
|
"keystore/README.md:\n" +
|
||||||
|
" keytool -genkey -noprompt -v \\\n" +
|
||||||
|
" -keystore keystore/release.jks \\\n" +
|
||||||
|
" -keyalg RSA -keysize 2048 -validity 10000 \\\n" +
|
||||||
|
" -alias incido \\\n" +
|
||||||
|
" -storepass incido_dev_keystore \\\n" +
|
||||||
|
" -keypass incido_dev_keystore \\\n" +
|
||||||
|
" -dname \"CN=Incido Dev, OU=Local, O=Incido, " +
|
||||||
|
"L=Local, ST=Local, C=NZ\""
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
storeFile = keystoreFilePath
|
||||||
|
storePassword = "incido_dev_keystore"
|
||||||
|
keyAlias = "incido"
|
||||||
|
keyPassword = "incido_dev_keystore"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +110,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// v0.3.6.0: ship version-stamped APKs at the repo root for every
|
// v0.3.6.0: ship version-stamped APKs at the repo root for every
|
||||||
// release (e.g. `incido-0.3.6.0-debug.apk`, `incido-0.3.6.0.apk`).
|
// release (e.g. `Incido-0.3.6.0-debug.apk`, `Incido-0.3.6.0-release.apk`).
|
||||||
// See Incido Development Plan §11 for the full release build
|
// See Incido Development Plan §11 for the full release build
|
||||||
// procedure.
|
// procedure.
|
||||||
//
|
//
|
||||||
@@ -105,7 +130,7 @@ val copyReleaseApks = tasks.register("copyReleaseApks") {
|
|||||||
group = "build"
|
group = "build"
|
||||||
description = "Copies debug + release APKs to the repo root, " +
|
description = "Copies debug + release APKs to the repo root, " +
|
||||||
"stamped with the current versionName " +
|
"stamped with the current versionName " +
|
||||||
"(e.g. incido-0.3.6.0-debug.apk, incido-0.3.6.0.apk). " +
|
"(e.g. Incido-0.3.6.3-debug.apk, Incido-0.3.6.3-release.apk). " +
|
||||||
"See Incido Development Plan §11."
|
"See Incido Development Plan §11."
|
||||||
dependsOn("assembleDebug", "assembleRelease")
|
dependsOn("assembleDebug", "assembleRelease")
|
||||||
doLast {
|
doLast {
|
||||||
@@ -113,8 +138,8 @@ val copyReleaseApks = tasks.register("copyReleaseApks") {
|
|||||||
val rootDir = rootProject.projectDir
|
val rootDir = rootProject.projectDir
|
||||||
val debugSrc = file("$buildDir/outputs/apk/debug/app-debug.apk")
|
val debugSrc = file("$buildDir/outputs/apk/debug/app-debug.apk")
|
||||||
val releaseSrc = file("$buildDir/outputs/apk/release/app-release.apk")
|
val releaseSrc = file("$buildDir/outputs/apk/release/app-release.apk")
|
||||||
val debugDest = file("$rootDir/incido-${versionName}-debug.apk")
|
val debugDest = file("$rootDir/Incido-${versionName}-debug.apk")
|
||||||
val releaseDest = file("$rootDir/incido-${versionName}.apk")
|
val releaseDest = file("$rootDir/Incido-${versionName}-release.apk")
|
||||||
if (debugSrc.exists()) {
|
if (debugSrc.exists()) {
|
||||||
debugSrc.copyTo(debugDest, overwrite = true)
|
debugSrc.copyTo(debugDest, overwrite = true)
|
||||||
logger.lifecycle("Copied: ${debugDest.absolutePath}")
|
logger.lifecycle("Copied: ${debugDest.absolutePath}")
|
||||||
|
|||||||
@@ -333,7 +333,7 @@ class SettingsViewModel(
|
|||||||
/** The version string baked into backup payloads and shown on
|
/** The version string baked into backup payloads and shown on
|
||||||
* the About card. Mirrors `app/build.gradle.kts` `versionName`
|
* the About card. Mirrors `app/build.gradle.kts` `versionName`
|
||||||
* — if you bump one, bump both. */
|
* — if you bump one, bump both. */
|
||||||
const val APP_VERSION = "0.3.6.1"
|
const val APP_VERSION = "0.3.6.3"
|
||||||
|
|
||||||
val Factory: ViewModelProvider.Factory = viewModelFactory {
|
val Factory: ViewModelProvider.Factory = viewModelFactory {
|
||||||
initializer {
|
initializer {
|
||||||
|
|||||||
Reference in new issue
Block a user