Gift mode: allow device to sleep instead of keeping screen on

Previously gift mode kept FLAG_KEEP_SCREEN_ON indefinitely, draining
the battery. Now when allow_sleep is enabled, gift mode clears the
flag and optionally disables WiFi after showing the gift screen and
writing the screensaver. The NOOK sleeps until the user taps to wake.

Also includes CI improvements:
- versionCode regression guard in set-version.sh
- Tag moves to version-bumped commit after CI stamps manifest
- Updated release docs

Author: bpmct

.github/workflows/build-apk.yml

@@ -69,6 +69,18 @@ jobs:
             git commit -m "Bump version to ${GITHUB_REF_NAME#v}"
             git push origin HEAD:main
           fi
+      - name: Move tag to version-bumped commit
+        if: startsWith(github.ref, 'refs/tags/')
+        shell: bash
+        run: |
+          set -euo pipefail
+          # After committing the version bump to main, the tag still points
+          # to the pre-bump commit. Move it so raw.githubusercontent.com
+          # serves the correct AndroidManifest.xml for this tag.
+          BUMP_SHA="$(git rev-parse HEAD)"
+          git tag -f "${GITHUB_REF_NAME}" "${BUMP_SHA}"
+          git push origin "${GITHUB_REF_NAME}" --force
+
 
       - name: Configure release signing
         if: startsWith(github.ref, 'refs/tags/')

AGENTS/release.md

@@ -6,10 +6,23 @@ unless the user explicitly requests it.
 
 ## Release flow (tags + GitHub Actions)
 
-Releases are driven by annotated tags like `v0.1.0`. The CI workflow
+Releases are driven by tags like `v0.1.0`. The CI workflow
 `build-apk.yml` stamps the manifest version, builds a signed release APK,
 and publishes a GitHub Release with the APK attached.
 
+### Safety guards (automated)
+
+- **versionCode regression check** — `set-version.sh` compares the computed
+  versionCode against the previous tag's manifest and **fails the build** if
+  it hasn't increased. This prevents releasing a tag with a stale or duplicate
+  versionCode.
+- **Tag moves to version-bumped commit** — After CI commits the version bump
+  to `main`, it force-pushes the tag to that commit. This ensures
+  `raw.githubusercontent.com/.../v0.9.4/AndroidManifest.xml` serves the
+  correct version (not the pre-bump snapshot). Without this, downstream
+  consumers (e.g. `bpmct/nooks`) that read the manifest from the tag ref
+  would see stale version info.
+
 ### Versioning nuance (when to bump major/minor/patch)
 
 This project follows semantic-versioning *in spirit*:

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bpmct.trmnl_nook_simple_touch"
-    android:versionCode="90399"
-    android:versionName="0.9.3" >
+    android:versionCode="90599"
+    android:versionName="0.9.5" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

src/com/bpmct/trmnl_nook_simple_touch/DisplayActivity.java

@@ -1010,6 +1010,16 @@ private void showGiftModeScreen() {
 
         // Write gift mode screen to screensaver so NOOK shows it when asleep
         writeGiftModeScreensaver(code, fromName, toName);
+
+        // Allow device to sleep; user tap wakes it
+        if (ApiPrefs.isAllowSleep(this)) {
+            setKeepScreenAwake(false);
+            if (ApiPrefs.isAutoDisableWifi(this)) {
+                WifiManager wifi = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+                if (wifi != null) wifi.setWifiEnabled(false);
+            }
+            logD("gift mode: sleep-ready (tap to wake)");
+        }
     }
 
     private LinearLayout createStepRow(String number, String text) {

tools/set-version.sh

@@ -35,6 +35,21 @@ if [[ ! -f "${MANIFEST}" ]]; then
   exit 1
 fi
 
+# Guard: ensure new versionCode is strictly higher than the previous release tag
+PREV_TAG="$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || true)"
+if [[ -n "${PREV_TAG}" ]]; then
+  PREV_CODE="$(git show "${PREV_TAG}:${MANIFEST}" 2>/dev/null \
+    | sed -n 's/.*android:versionCode="\([0-9]*\)".*/\1/p' || true)"
+  if [[ -n "${PREV_CODE}" && "${VERSION_CODE}" -le "${PREV_CODE}" ]]; then
+    echo "error: new versionCode ${VERSION_CODE} is not higher than previous tag ${PREV_TAG} (versionCode=${PREV_CODE})" >&2
+    echo "hint: this usually means the tag version was not bumped correctly" >&2
+    exit 1
+  fi
+  if [[ -n "${PREV_CODE}" ]]; then
+    echo "versionCode check passed: ${VERSION_CODE} > ${PREV_CODE} (${PREV_TAG})"
+  fi
+fi
+
 python3 - <<PY
 import re
 from pathlib import Path