feat: v0.3.6.0 — AES-GCM field encryption, PIN/passphrase security, encryption verifier, backup codec
build / Assemble debug APK (push) Failing after 2s

This commit is contained in:
Incido Developer committed 2026-08-20 01:14:15 +12:00
1 parent 089926377c
commit 14d61c78d3
55 files changed
+2474 -715

No files matched your search

+65 -9
View File
@@ -28,15 +28,17 @@ android {
applicationId = "org.incido.app"
minSdk = 26
targetSdk = 35
// v0.3.3.4: emergency hotfix — the favorite star on the note
// cards was drawn in the title row and overlapped the
// three-dot overflow button in the card's top-right corner.
// The star is now an overlay in the card's bottom-right corner
// with the same 4.dp end offset as the overflow button, so
// both controls sit in the same vertical column and no longer
// collide. versionCode monotonic +1 from v0.3.3.3 (18).
versionCode = 19
versionName = "0.3.3.4"
// v0.3.6.0: link-share titles + encryption-key recovery.
// - Shared URLs now seed the note with the page title (from
// the browser's EXTRA_SUBJECT) on the first line and the
// URL below — fully offline, no INTERNET permission.
// - New "Export / Import encryption key" rows in Settings →
// Security: back up the AES-256 key that protects your
// notes to a passphrase-protected .inckey file, and
// restore it on a fresh install.
// versionCode monotonic +1 from v0.3.5.1 (26).
versionCode = 27
versionName = "0.3.6.0"
}
// --- Signing ---
@@ -82,6 +84,60 @@ android {
}
}
// 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`).
// See Incido Development Plan §11 for the full release build
// procedure.
//
// Rather than mutating each variant's `outputFileName` (which trips over
// Kotlin/Gradle DSL overload ambiguities in AGP 8.x — the legacy
// `applicationVariants.outputs.all { ... }` lambda resolution clashes
// with `Iterable<T>.all(predicate: (T) -> Boolean)` and the modern
// `androidComponents.onVariants` API doesn't expose `outputFileName` as
// a settable property on its outputs), we just register a copy task
// that runs after both `assembleDebug` and `assembleRelease` and drops
// the built APKs at the project root with the right names.
//
// `copyReleaseApks` is registered as a `dependsOn` of `assembleRelease`
// so `./gradlew assembleRelease` is enough to get both files at the
// repo root in one command.
val copyReleaseApks = tasks.register("copyReleaseApks") {
group = "build"
description = "Copies debug + release APKs to the repo root, " +
"stamped with the current versionName " +
"(e.g. incido-0.3.6.0-debug.apk, incido-0.3.6.0.apk). " +
"See Incido Development Plan §11."
dependsOn("assembleDebug", "assembleRelease")
doLast {
val versionName = android.defaultConfig.versionName
val rootDir = rootProject.projectDir
val debugSrc = file("$buildDir/outputs/apk/debug/app-debug.apk")
val releaseSrc = file("$buildDir/outputs/apk/release/app-release.apk")
val debugDest = file("$rootDir/incido-${versionName}-debug.apk")
val releaseDest = file("$rootDir/incido-${versionName}.apk")
if (debugSrc.exists()) {
debugSrc.copyTo(debugDest, overwrite = true)
logger.lifecycle("Copied: ${debugDest.absolutePath}")
} else {
logger.warn("Debug APK not found at ${debugSrc.absolutePath}")
}
if (releaseSrc.exists()) {
releaseSrc.copyTo(releaseDest, overwrite = true)
logger.lifecycle("Copied: ${releaseDest.absolutePath}")
} else {
logger.warn("Release APK not found at ${releaseSrc.absolutePath}")
}
}
}
// Make `assembleRelease` finalize with `copyReleaseApks` so a single
// `./gradlew assembleRelease` produces both root-level APKs. Using
// `finalizedBy` (not `dependsOn`) avoids a circular dependency:
// `copyReleaseApks` already `dependsOn` `assembleRelease`.
afterEvaluate {
tasks.findByName("assembleRelease")?.finalizedBy(copyReleaseApks)
}
dependencies {
implementation(project(":composeApp"))
// v0.3.1.0: MainActivity needs the NoteRepository type to hand it
@@ -3,6 +3,7 @@ package org.incido.app
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.WindowManager
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.fragment.app.FragmentActivity
@@ -37,6 +38,14 @@ class MainActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
// v0.3.5.0: block screenshots / screen recording / app-switcher
// previews per the user's preference (ON by default). Apply the
// snapshot synchronously so the very first frame is protected,
// then keep reacting to the settings flow so flipping the
// toggle in Settings takes effect immediately.
applyScreenshotBlock((application as org.incido.compose.IncidoApplication)
.container.settingsRepository.snapshot().blockScreenshots)
observeScreenshotBlock()
handleShareIntent(intent)
setContent {
val app = application as org.incido.compose.IncidoApplication
@@ -73,6 +82,28 @@ class MainActivity : FragmentActivity() {
app?.container?.securityManager?.onAppBackgrounded()
}
/** v0.3.5.0 — set or clear [WindowManager.LayoutParams.FLAG_SECURE]. */
private fun applyScreenshotBlock(block: Boolean) {
if (block) {
window.setFlags(
WindowManager.LayoutParams.FLAG_SECURE,
WindowManager.LayoutParams.FLAG_SECURE,
)
} else {
window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
}
/** v0.3.5.0 — react to live changes of the "Block screenshots" toggle. */
private fun observeScreenshotBlock() {
val app = application as org.incido.compose.IncidoApplication
lifecycleScope.launch {
app.container.settingsRepository.userSettingsFlow.collect { settings ->
applyScreenshotBlock(settings.blockScreenshots)
}
}
}
/**
* Decode any ACTION_SEND / ACTION_SEND_MULTIPLE payload into a
* [SharedIntentBuffer.Payload] and stash it. Safe to call multiple
@@ -90,7 +121,13 @@ class MainActivity : FragmentActivity() {
// would otherwise run the image-byte I/O asynchronously and miss
// the first composition. We push an initial payload with no
// images; the async block then re-`put`s with images appended.
//
// v0.3.6.0: also stash EXTRA_SUBJECT — most browsers fill it
// with the page `<title>` for share-URL intents, which the
// LinkedShareComposer uses as the note title (offline-only,
// see app/src/main/AndroidManifest.xml).
val text: String? = intent.getStringExtra(Intent.EXTRA_TEXT)
val subject: String? = intent.getStringExtra(Intent.EXTRA_SUBJECT)
val uris: List<Uri> = when (action) {
Intent.ACTION_SEND -> listOfNotNull(
@Suppress("DEPRECATION")
@@ -101,7 +138,7 @@ class MainActivity : FragmentActivity() {
else -> emptyList()
}
SharedIntentBuffer.put(
SharedIntentBuffer.Payload(text = text, images = emptyList())
SharedIntentBuffer.Payload(text = text, images = emptyList(), subject = subject)
)
if (uris.isNotEmpty()) {
Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<!--
Foreground glyph for the adaptive launcher icon. A stylised
inscription mark — two parallel lines bisected by a diagonal cut.
The "incido" mark. Sized for the 72dp safe area inside the 108dp
adaptive icon canvas.
-->
<!-- Left vertical bar -->
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 38 30 L 46 30 L 46 78 L 38 78 Z" />
<!-- Right vertical bar -->
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 62 30 L 70 30 L 70 78 L 62 78 Z" />
<!-- Diagonal cut (incido = "I cut into") -->
<path
android:fillColor="#FFFFFFFF"
android:pathData="M 34 42 L 74 66 L 70 72 L 30 48 Z" />
</vector>
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
v0.3.3.8: designed icon replaces the v0.1 placeholder glyph.
The foreground is the density-bucketed incido.png artwork
(drawable-<density>/ic_launcher_foreground.png, sized for the
108dp adaptive canvas); the background matches the artwork's
edge colour so parallax exposure is seamless.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
</adaptive-icon>
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
v0.3.3.8: designed icon replaces the v0.1 placeholder glyph.
Round launcher variant of the adaptive icon; same artwork
layers as ic_launcher.xml.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
</adaptive-icon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

+4 -2
View File
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Brand-neutral background for the adaptive launcher icon. -->
<color name="ic_launcher_background">#6650A4</color>
<!-- v0.3.3.8: background for the adaptive launcher icon, matched to
the edge colour of the incido.png artwork so parallax exposure
of the background layer is seamless. -->
<color name="ic_launcher_background">#010435</color>
</resources>