diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98a6801ee..91a2eec8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -746,6 +746,14 @@ jobs: make android-copy-release-apks make android-copy-bundle + - name: Preserve Android Native Crash Symbols + uses: actions/upload-artifact@v4 + with: + name: android-native-symbols + path: droid/app/build/intermediates/native_debug_metadata/**/out/**/*.dbg + if-no-files-found: error + retention-days: 90 + - name: Collect Android Release Files run: | set -euo pipefail diff --git a/CHANGELOG.md b/CHANGELOG.md index d5195f08e..6cc90619d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ # Changelog +## [2.0.8] - 2026-10-02 +### Fixed +- Fixed an Android startup crash after upgrading from older versions, while preserving saved preferences and practice history. +- Keep drawing the app when a device cannot allocate the graphics buffers used for screen transitions. + ## [2.0.7] - 2026-10-01 ### Added - Mini mode provides a compact practice window without changing your saved window or navigation settings. diff --git a/Makefile b/Makefile index 6a275797d..ad731c2b3 100644 --- a/Makefile +++ b/Makefile @@ -2552,7 +2552,13 @@ android-avd: android-smoke: @mkdir -p build/android - sh scripts/android-smoke-test.sh "$(ANDROID_SDK)" "$(ANDROID_APP_ID)" "$(ANDROID_ACTIVITY)" + sh scripts/android-smoke-test.sh "$(ANDROID_SDK)" "$(ANDROID_DEBUG_APP_ID)" "$(ANDROID_ACTIVITY)" + +.PHONY: android-smoke-script-test +android-smoke-script-test: + python3 tests/android_smoke_script_test.py + +test: android-smoke-script-test android-audio-e2e: bash scripts/android-audio-e2e.sh diff --git a/droid/app/build.gradle b/droid/app/build.gradle index 449d12442..3f38b2df8 100644 --- a/droid/app/build.gradle +++ b/droid/app/build.gradle @@ -53,8 +53,8 @@ android { applicationId "xyz.waozi.inbe" minSdk 21 targetSdk 36 - versionCode 131 - versionName "2.0.7" + versionCode 132 + versionName "2.0.8" manifestPlaceholders = [ inbeAppLabel: "Inner Breeze", inbeUsesCleartextTraffic: "false" @@ -79,6 +79,7 @@ android { buildTypes { release { signingConfig project.hasProperty('fDroidBuild') ? null : signingConfigs.release + ndk.debugSymbolLevel 'FULL' minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' diff --git a/droid/app/src/main/cpp/CMakeLists.txt b/droid/app/src/main/cpp/CMakeLists.txt index d80c77e7c..2bda0064f 100644 --- a/droid/app/src/main/cpp/CMakeLists.txt +++ b/droid/app/src/main/cpp/CMakeLists.txt @@ -49,6 +49,7 @@ file(GLOB ZIRAN_SOURCES CONFIGURE_DEPENDS "${ZIRAN_DIR}/cmd/zir-ir/*.c" "${ZIRAN_DIR}/cmd/zir-ir/*.h") find_program(HOST_MAKE NAMES make gmake REQUIRED) find_program(HOST_PYTHON NAMES python3 REQUIRED) +find_program(HOST_CC NAMES cc gcc REQUIRED NO_CMAKE_FIND_ROOT_PATH) set(ZIRAN_BIN "${ZIRAN_BUILD_DIR}/bin/ziran") add_custom_target(app_build_laws COMMAND "${HOST_PYTHON}" "${REPO_ROOT}/scripts/check-version.py" @@ -69,6 +70,7 @@ add_custom_command( OUTPUT "${ZI2C_BIN}" BYPRODUCTS "${ZI2ZIR_BIN}" COMMAND "${HOST_MAKE}" -j1 -C "${ZIRAN_DIR}" + "CC=${HOST_CC}" "HOST_CC=${HOST_CC}" "BUILD_DIR=${ZIRAN_BUILD_DIR}" all DEPENDS ${ZIRAN_SOURCES} "${ZIRAN_DIR}/Makefile" VERBATIM @@ -99,6 +101,7 @@ string(APPEND APP_ZIRAN_CHECK_DEFINES " ${APP_ZIRAN_ARCH}") # CMake needs the complete emitted import graph before it creates build rules. # Run the same required law gates before this initial source generation. execute_process(COMMAND "${HOST_MAKE}" -j1 -C "${ZIRAN_DIR}" + "CC=${HOST_CC}" "HOST_CC=${HOST_CC}" "BUILD_DIR=${ZIRAN_BUILD_DIR}" all COMMAND_ERROR_IS_FATAL ANY) execute_process(COMMAND "${HOST_PYTHON}" "${REPO_ROOT}/scripts/check-version.py" WORKING_DIRECTORY "${REPO_ROOT}" COMMAND_ERROR_IS_FATAL ANY) diff --git a/fastlane/metadata/android/en-US/changelogs/132.txt b/fastlane/metadata/android/en-US/changelogs/132.txt new file mode 100644 index 000000000..074f8a072 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/132.txt @@ -0,0 +1,4 @@ +Fixed +--- +- Fixed an Android startup crash after upgrading from older versions, while preserving saved preferences and practice history. +- Keep drawing the app when a device cannot allocate the graphics buffers used for screen transitions. diff --git a/packaging/click/control b/packaging/click/control index 3ae8dc8b6..ee0f0d11b 100644 --- a/packaging/click/control +++ b/packaging/click/control @@ -1,5 +1,5 @@ Package: inbe.waozi -Version: 2.0.7 +Version: 2.0.8 Architecture: arm64 Maintainer: Waozi Click-Version: 0.4 diff --git a/packaging/click/inbe.metainfo.xml b/packaging/click/inbe.metainfo.xml index 6f9433197..ac16fe12a 100644 --- a/packaging/click/inbe.metainfo.xml +++ b/packaging/click/inbe.metainfo.xml @@ -28,7 +28,7 @@ inbe - + diff --git a/packaging/click/manifest.json b/packaging/click/manifest.json index 4c77e0c7a..3ae1daa8b 100644 --- a/packaging/click/manifest.json +++ b/packaging/click/manifest.json @@ -1,7 +1,7 @@ { "name": "inbe", "title": "Inner Breeze", - "version": "2.0.7", + "version": "2.0.8", "architecture": "arm64", "framework": "ubuntu-sdk-20.04", "description": "Syncable breathing, meditation, and habit practice app.", diff --git a/packaging/firefox-addons/manifest.json b/packaging/firefox-addons/manifest.json index 675227ed2..823b86c68 100644 --- a/packaging/firefox-addons/manifest.json +++ b/packaging/firefox-addons/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "Inner Breeze", "short_name": "Inbe", - "version": "2.0.7", + "version": "2.0.8", "description": "Breathing, meditation, habit tracking, and encrypted sync.", "permissions": [ "contextMenus" diff --git a/packaging/linux/appimage/inbe.appdata.xml b/packaging/linux/appimage/inbe.appdata.xml index 55ea3c0c6..28d24397d 100644 --- a/packaging/linux/appimage/inbe.appdata.xml +++ b/packaging/linux/appimage/inbe.appdata.xml @@ -22,7 +22,7 @@ inbe - + diff --git a/packaging/snap/snap/gui/inbe.metainfo.xml b/packaging/snap/snap/gui/inbe.metainfo.xml index 0df3aa60e..c38135159 100644 --- a/packaging/snap/snap/gui/inbe.metainfo.xml +++ b/packaging/snap/snap/gui/inbe.metainfo.xml @@ -22,7 +22,7 @@ inbe - + diff --git a/packaging/snap/snap/snapcraft.yaml b/packaging/snap/snap/snapcraft.yaml index b31f1d77e..24889e1df 100644 --- a/packaging/snap/snap/snapcraft.yaml +++ b/packaging/snap/snap/snapcraft.yaml @@ -6,7 +6,7 @@ description: | meditation, and habit tracking with visual and audio cues, meditation timers, habit counters, session history, and optional sync. -version: '2.0.7' +version: '2.0.8' license: BSD-3-Clause base: core22 confinement: strict diff --git a/scripts/android-smoke-test.sh b/scripts/android-smoke-test.sh index af08e14a2..a6e61394b 100644 --- a/scripts/android-smoke-test.sh +++ b/scripts/android-smoke-test.sh @@ -1,40 +1,90 @@ #!/bin/sh set -eu +root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd) +cd "$root" sdk_root=${ANDROID_SDK_ROOT:-${ANDROID_HOME:-${1:-}}} -app_id=${2:-xyz.waozi.inbe} +app_id=${2:-xyz.waozi.inbe.debug} activity=${3:-xyz.waozi.inbe.MainActivity} +serial=${ANDROID_SMOKE_SERIAL:-${ANDROID_EMULATOR_PORT:+emulator-$ANDROID_EMULATOR_PORT}} +observations=${ANDROID_SMOKE_OBSERVATIONS:-15} +interval=${ANDROID_SMOKE_INTERVAL:-1} +logs=${ANDROID_SMOKE_LOG_DIR:-build/android} -if [ -z "$sdk_root" ]; then - echo "android smoke: set ANDROID_SDK_ROOT or ANDROID_HOME" - exit 2 -fi - -emulator="$sdk_root/emulator/emulator" -if [ ! -x "$emulator" ]; then - echo "android smoke: Android Emulator package is missing: $emulator" - echo "android smoke: install it with: sdkmanager \"emulator\"" - exit 2 -fi - -bash scripts/emulator.sh - -adb_cmd="$sdk_root/platform-tools/adb" -if [ ! -x "$adb_cmd" ]; then - adb_cmd=adb -fi - -"$adb_cmd" -e wait-for-device -"$adb_cmd" -e logcat -c || true -${MAKE:-make} android-install ADB="$adb_cmd -e" -sleep 5 -"$adb_cmd" -e shell am start -n "$app_id/$activity" >/dev/null -sleep 3 -"$adb_cmd" -e logcat -d -t 400 > build/android/android-smoke-logcat.txt - -if grep -E "FATAL EXCEPTION|Fatal signal|AndroidRuntime|DEBUG.*backtrace" build/android/android-smoke-logcat.txt >/dev/null; then - echo "android smoke: FAIL; see build/android/android-smoke-logcat.txt" +fail() { + echo "android smoke: FAIL: $*; see $logs/android-smoke-logcat.txt" >&2 exit 1 +} + +[ -n "$sdk_root" ] || { echo 'android smoke: set ANDROID_SDK_ROOT or ANDROID_HOME' >&2; exit 2; } +adb_cmd="$sdk_root/platform-tools/adb" +[ -x "$adb_cmd" ] || adb_cmd=adb +adb_run() { + if [ -n "$serial" ]; then "$adb_cmd" -s "$serial" "$@" + else "$adb_cmd" -e "$@" + fi +} +case "$observations" in ''|*[!0-9]*) echo 'android smoke: observations must be a positive integer' >&2; exit 2;; esac +[ "$observations" -gt 0 ] || exit 2 +mkdir -p "$logs" +capture() { + adb_run logcat -d -v threadtime > "$logs/android-smoke-logcat.txt" 2>&1 || true + adb_run logcat -b crash -d > "$logs/android-smoke-crash.txt" 2>&1 || true + adb_run shell dumpsys activity exit-info "$app_id" > "$logs/android-smoke-exit-info.txt" 2>&1 || true +} +trap capture EXIT + +if [ "${ANDROID_SMOKE_SKIP_EMULATOR:-0}" != 1 ]; then + env -u DISPLAY -u WAYLAND_DISPLAY ANDROID_EMULATOR_HEADLESS=1 bash scripts/emulator.sh +fi +if [ -n "$serial" ]; then + timeout 180 "$adb_cmd" -s "$serial" wait-for-device +else + timeout 180 "$adb_cmd" -e wait-for-device +fi +adb_run logcat -c +if [ -n "${ANDROID_SMOKE_APK:-}" ]; then + [ -f "$ANDROID_SMOKE_APK" ] || fail 'APK does not exist' + adb_run install -r -t "$ANDROID_SMOKE_APK" +else + selector=-e + if [ -n "$serial" ]; then selector="-s $serial"; fi + ${MAKE:-make} android-install ADB="$adb_cmd $selector" fi -echo "android smoke: PASS" +start() { + adb_run shell am start -W -n "$app_id/$activity" > "$logs/android-smoke-launch.txt" 2>&1 || fail 'activity could not start' + if ! grep -q '^Status: ok' "$logs/android-smoke-launch.txt"; then + cat "$logs/android-smoke-launch.txt" >&2 + fail 'activity launch did not succeed' + fi +} +process() { adb_run shell pidof "$app_id" 2>/dev/null | tr -d '\r'; } +observe() { + count=0 + while [ "$count" -lt "$observations" ]; do + sleep "$interval" + current=$(process || true) + [ -n "$current" ] || fail 'app process exited' + [ "$current" = "$pid" ] || fail 'app process restarted unexpectedly' + count=$((count + 1)) + done +} +foreground() { + adb_run shell dumpsys activity activities > "$logs/android-smoke-activity.txt" + grep -E 'mResumedActivity|topResumedActivity' "$logs/android-smoke-activity.txt" | + grep -F "$app_id/" > /dev/null || fail 'app is not the resumed activity' +} + +adb_run shell am force-stop "$app_id" +start +pid=$(process || true) +[ -n "$pid" ] || fail 'app exited during startup' +observe +foreground +adb_run shell input keyevent KEYCODE_HOME +observe +start +observe +foreground +echo "android smoke: PASS: $app_id survived startup and background/resume (PID $pid)" diff --git a/scripts/emulator.sh b/scripts/emulator.sh index 44f2e0629..5a3017cef 100755 --- a/scripts/emulator.sh +++ b/scripts/emulator.sh @@ -91,6 +91,12 @@ else QEMU_MEMORY_ARGS=() fi +if [ "${ANDROID_EMULATOR_HEADLESS:-0}" = 1 ]; then + WINDOW_ARGS=(-no-window) +else + WINDOW_ARGS=() +fi + EMULATOR_CMD="${ANDROID_SDK_ROOT}/emulator/emulator" if [ ! -x "$EMULATOR_CMD" ]; then EMULATOR_CMD="$(command -v emulator)" @@ -141,6 +147,7 @@ if [ "$SOFT_EMULATOR" -eq 1 ]; then -verbose > /tmp/emulator.log 2>&1 & else LD_LIBRARY_PATH="$EMULATOR_LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" "$EMULATOR_CMD" @"$AVD_NAME" \ + "${WINDOW_ARGS[@]}" \ "${AUDIO_ARGS[@]}" \ "${PORT_ARGS[@]}" \ "${MEMORY_ARGS[@]}" \ diff --git a/src/core/version.h b/src/core/version.h index 7b74ce8cd..b712ae754 100644 --- a/src/core/version.h +++ b/src/core/version.h @@ -3,7 +3,7 @@ #define APP_VERSION_MAJOR 2 #define APP_VERSION_MINOR 0 -#define APP_VERSION_PATCH 7 -#define APP_VERSION_STRING "2.0.7" +#define APP_VERSION_PATCH 8 +#define APP_VERSION_STRING "2.0.8" #endif diff --git a/src/core/version.zi b/src/core/version.zi index 4ad150d93..e0af410ec 100644 --- a/src/core/version.zi +++ b/src/core/version.zi @@ -1,5 +1,5 @@ // Generated by update_version.sh from CHANGELOG.md. Do not edit by hand. VersionMajor :: 2 VersionMinor :: 0 -VersionPatch :: 7 -VersionString :: "2.0.7" +VersionPatch :: 8 +VersionString :: "2.0.8" diff --git a/tests/android_smoke_script_test.py b/tests/android_smoke_script_test.py new file mode 100644 index 000000000..51e0fecca --- /dev/null +++ b/tests/android_smoke_script_test.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +"""Exercise launch failures and process deaths without a device or display.""" +import json +import os +from pathlib import Path +import subprocess +import tempfile + +root = Path(__file__).resolve().parents[1] +fake_adb = '''#!/usr/bin/env python3 +import json +import os +from pathlib import Path +import sys +path = Path(os.environ['SMOKE_STATE']) +state = json.loads(path.read_text()) if path.exists() else {'calls': [], 'polls': 0, 'home': False} +args = sys.argv[1:] +assert args[:2] == ['-s', 'emulator-5584'], args +args = args[2:] +state['calls'].append(args) +mode = os.environ['SMOKE_CASE'] +if args[:2] == ['shell', 'pidof']: + assert args[2] == 'xyz.waozi.inbe.debug', args + state['polls'] += 1 + dead = mode == 'startup_crash' or (mode == 'crash' and state['polls'] > 1) or (mode == 'background_crash' and state['home']) + if not dead: + print('84' if mode == 'restart' and state['polls'] > 1 else '42') +elif args[:3] == ['shell', 'am', 'start']: + assert 'xyz.waozi.inbe.debug/xyz.waozi.inbe.MainActivity' in args, args + print('Error type 3: activity does not exist' if mode == 'launch_error' else 'Status: ok') +elif args[:3] == ['shell', 'input', 'keyevent']: + state['home'] = True +elif args[:4] == ['shell', 'dumpsys', 'activity', 'activities']: + print('mResumedActivity: other.app/.Activity' if mode == 'not_foreground' else 'mResumedActivity: xyz.waozi.inbe.debug/.MainActivity') +elif args[:1] == ['logcat']: + print('E AndroidRuntime: diagnostic from an unrelated process') +path.write_text(json.dumps(state)) +''' + +with tempfile.TemporaryDirectory(prefix="android-smoke-", dir=root / "build") as directory: + work = Path(directory) + sdk = work / "sdk" + (sdk / "platform-tools").mkdir(parents=True) + adb = sdk / "platform-tools/adb" + adb.write_text(fake_adb) + adb.chmod(0o755) + apk = work / "app.apk" + apk.touch() + for mode in ("healthy", "launch_error", "startup_crash", "crash", + "restart", "background_crash", "not_foreground"): + state = work / f"{mode}.json" + env = os.environ.copy() + env.pop("DISPLAY", None) + env.pop("WAYLAND_DISPLAY", None) + env.update(ANDROID_HOME=str(sdk), ANDROID_SDK_ROOT=str(sdk), + ANDROID_SMOKE_SKIP_EMULATOR="1", ANDROID_SMOKE_APK=str(apk), + ANDROID_SMOKE_SERIAL="emulator-5584", + ANDROID_SMOKE_OBSERVATIONS="2", ANDROID_SMOKE_INTERVAL="0", + ANDROID_SMOKE_LOG_DIR=str(work / mode), + SMOKE_STATE=str(state), SMOKE_CASE=mode) + result = subprocess.run(["sh", str(root / "scripts/android-smoke-test.sh")], + cwd=root, env=env, capture_output=True, text=True) + assert (result.returncode == 0) == (mode == "healthy"), (mode, result.stdout, result.stderr) + calls = json.loads(state.read_text())["calls"] + assert ["install", "-r", "-t", str(apk)] in calls + assert (work / mode / "android-smoke-logcat.txt").exists() +print("Android smoke: launch status, correct app ID, process death/restart and resume checks passed") diff --git a/tests/fixtures/schema-1.8.9.sql b/tests/fixtures/schema-1.8.9.sql new file mode 100644 index 000000000..6a0c1baa7 --- /dev/null +++ b/tests/fixtures/schema-1.8.9.sql @@ -0,0 +1,18 @@ +-- Inbe 1.8.9 schema_create SQL, extracted from src/storage/db.c. +-- Upstream commit: 5cdfa63d6ad9989cc1d51af5edb1d067cf453176 +PRAGMA journal_mode=DELETE; +PRAGMA foreign_keys=ON; +CREATE TABLE IF NOT EXISTS meta( key TEXT PRIMARY KEY, value TEXT NOT NULL); +CREATE TABLE IF NOT EXISTS users( id TEXT PRIMARY KEY, created_at INTEGER NOT NULL, kind TEXT NOT NULL); +CREATE TABLE IF NOT EXISTS settings( user_id TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, updated_at INTEGER NOT NULL, PRIMARY KEY(user_id,key)); +CREATE TABLE IF NOT EXISTS social_snapshots( user_id TEXT NOT NULL, kind TEXT NOT NULL, json TEXT NOT NULL, updated_at INTEGER NOT NULL, PRIMARY KEY(user_id,kind)); +CREATE TABLE IF NOT EXISTS sessions( id TEXT PRIMARY KEY, user_id TEXT NOT NULL, started_at INTEGER NOT NULL, local_date INTEGER NOT NULL, topic INTEGER NOT NULL DEFAULT 0, activity INTEGER NOT NULL DEFAULT 0, source TEXT NOT NULL, imported_at INTEGER NOT NULL, rounds_hash INTEGER NOT NULL, deleted_at INTEGER NOT NULL DEFAULT 0, updated_at INTEGER NOT NULL DEFAULT 0, UNIQUE(user_id,started_at,rounds_hash)); +CREATE TABLE IF NOT EXISTS session_rounds( session_id TEXT NOT NULL, round_index INTEGER NOT NULL, seconds INTEGER NOT NULL, PRIMARY KEY(session_id,round_index)); +CREATE TABLE IF NOT EXISTS meditation_logs( id TEXT PRIMARY KEY, user_id TEXT NOT NULL, session_id TEXT NOT NULL, duration_seconds INTEGER NOT NULL, completed_at INTEGER NOT NULL, updated_at INTEGER NOT NULL DEFAULT 0); +CREATE TABLE IF NOT EXISTS habits( id TEXT PRIMARY KEY, user_id TEXT NOT NULL, name TEXT NOT NULL, description TEXT NOT NULL DEFAULT '', color_r INTEGER NOT NULL, color_g INTEGER NOT NULL, color_b INTEGER NOT NULL, sync_mode INTEGER NOT NULL, sync_activity INTEGER NOT NULL, counter_enabled INTEGER NOT NULL DEFAULT 0, sort_order INTEGER NOT NULL, deleted_at INTEGER NOT NULL DEFAULT 0, updated_at INTEGER NOT NULL DEFAULT 0); +CREATE TABLE IF NOT EXISTS habit_days( habit_id TEXT NOT NULL, local_date INTEGER NOT NULL, completed INTEGER NOT NULL, count INTEGER NOT NULL DEFAULT 0, session_count INTEGER NOT NULL DEFAULT 0, updated_at INTEGER NOT NULL, PRIMARY KEY(habit_id,local_date)); +CREATE TABLE IF NOT EXISTS imports( id TEXT PRIMARY KEY, imported_at INTEGER NOT NULL, format TEXT NOT NULL, source_name TEXT NOT NULL, session_count INTEGER NOT NULL, habit_count INTEGER NOT NULL); +CREATE TABLE IF NOT EXISTS sync_outbox( seq INTEGER PRIMARY KEY AUTOINCREMENT, entity_type TEXT NOT NULL, entity_id TEXT NOT NULL, local_date INTEGER NOT NULL DEFAULT 0, queued_at INTEGER NOT NULL, UNIQUE(entity_type,entity_id,local_date)); +CREATE TABLE IF NOT EXISTS sync_ops( op_id TEXT PRIMARY KEY, client_id TEXT NOT NULL, seq INTEGER NOT NULL, entity_type TEXT NOT NULL, entity_id TEXT NOT NULL, local_date INTEGER NOT NULL DEFAULT 0, op_type TEXT NOT NULL, payload_json TEXT NOT NULL DEFAULT '', created_at INTEGER NOT NULL, sent_at INTEGER NOT NULL DEFAULT 0, acked_at INTEGER NOT NULL DEFAULT 0); +INSERT OR IGNORE INTO meta(key,value) VALUES('schema_version','1'); + diff --git a/tests/schema_zi_test.c b/tests/schema_zi_test.c index 96ad257f6..77258df3d 100644 --- a/tests/schema_zi_test.c +++ b/tests/schema_zi_test.c @@ -3,6 +3,7 @@ #include #include #include +#include #include static sqlite3 *database; @@ -105,8 +106,80 @@ static void close_database(void) database = NULL; } -int main(void) +static void upgrade_1_8_9(const char *fixture) { + FILE *file = fopen(fixture, "rb"); + assert(file != NULL); + assert(fseek(file, 0, SEEK_END) == 0); + long length = ftell(file); + assert(length > 0); + rewind(file); + char *sql = malloc((size_t)length + 1); + assert(sql != NULL); + assert(fread(sql, 1, (size_t)length, file) == (size_t)length); + sql[length] = '\0'; + assert(fclose(file) == 0); + + open_memory_database(); + assert(exec_sql((uint8_t *)sql)); + free(sql); + assert(exec_sql((uint8_t *) + "INSERT INTO users VALUES('upgrade-user',123,'local');" + "INSERT INTO settings VALUES('upgrade-user','style_index','3',124);" + "INSERT INTO settings VALUES('upgrade-user','language','es',124);" + "INSERT INTO habits VALUES('habit','upgrade-user','Practice','Keep me'," + "10,20,30,0,0,1,0,0,125);" + "INSERT INTO habit_days VALUES('habit',20261001,1,7,2,126);" + "INSERT INTO sessions VALUES('session','upgrade-user',127,20261001," + "0,0,'local',127,12345,0,128);" + "INSERT INTO session_rounds VALUES('session',0,60);" + "INSERT INTO meditation_logs VALUES('meditation','upgrade-user'," + "'session',60,129,130);" + "INSERT INTO social_snapshots VALUES('upgrade-user','friends','{}',131);" + "INSERT INTO imports VALUES('import',132,'csv','fixture',1,1);" + "INSERT INTO sync_outbox(entity_type,entity_id,local_date,queued_at) " + "VALUES('habit','habit',0,133);" + "INSERT INTO sync_ops VALUES('pending-op','client',1,'habit','habit'," + "0,'upsert','{\"name\":\"Practice\"}',134,0,0);")); + + /* Opening the upgraded database repeatedly must retain all existing + * rows, identity, preferences and pending synchronization work. */ + for(int launch = 0; launch < 2; launch++) { + assert(schema_create()); + assert(migrate_schema()); + assert(load_or_create_user()); + assert(strcmp(current_user_id, "upgrade-user") == 0); + assert(scalar("SELECT COUNT(*) FROM users") == 1); + assert(scalar("SELECT COUNT(*) FROM settings WHERE " + "key='style_index' AND value='3'") == 1); + assert(scalar("SELECT COUNT(*) FROM settings WHERE " + "key='language' AND value='es'") == 1); + assert(scalar("SELECT COUNT(*) FROM habits WHERE id='habit' AND " + "description='Keep me' AND counter_enabled=1 AND " + "counter_target=1 AND weekdays=0 AND reminder_hour=-1 " + "AND updated_at=125") == 1); + assert(scalar("SELECT count FROM habit_days") == 7); + assert(scalar("SELECT session_count FROM habit_days") == 2); + assert(scalar("SELECT COUNT(*) FROM sessions WHERE id='session' AND " + "updated_at=128 AND mood_before=0 AND mood_after=0 " + "AND rounds_hash=12345") == 1); + assert(scalar("SELECT seconds FROM session_rounds") == 60); + assert(scalar("SELECT duration_seconds FROM meditation_logs") == 60); + assert(scalar("SELECT COUNT(*) FROM social_snapshots") == 1); + assert(scalar("SELECT COUNT(*) FROM imports") == 1); + assert(scalar("SELECT COUNT(*) FROM sync_outbox") == 1); + assert(scalar("SELECT queued_at FROM sync_outbox") == 133); + assert(scalar("SELECT COUNT(*) FROM sync_ops WHERE " + "op_id='pending-op' AND acked_at=0 AND " + "payload_json='{\"name\":\"Practice\"}'") == 1); + } + close_database(); +} + +int main(int argc, char **argv) +{ + assert(argc == 2); + upgrade_1_8_9(argv[1]); open_memory_database(); assert(schema_create()); assert(!has_table("sync_outbox")); diff --git a/tests/schema_zi_test.sh b/tests/schema_zi_test.sh index f6d0a80e4..1c13f6eff 100644 --- a/tests/schema_zi_test.sh +++ b/tests/schema_zi_test.sh @@ -29,4 +29,5 @@ mkdir -p "$work/generated" "$work/generated/sqlite.c" \ "$root/vendor-builds/sqlite/sqlite3.c" -ldl -lpthread -lm \ -o "$work/test" -env -u DISPLAY -u WAYLAND_DISPLAY "$work/test" +env -u DISPLAY -u WAYLAND_DISPLAY "$work/test" \ + "$root/tests/fixtures/schema-1.8.9.sql" diff --git a/tests/style_apply_link_behavior.zi b/tests/style_apply_link_behavior.zi index 7094fc3da..95092949b 100644 --- a/tests/style_apply_link_behavior.zi +++ b/tests/style_apply_link_behavior.zi @@ -1,10 +1,24 @@ #import, file "../src/app/app_style.zi"; #import, file "../src/app/app_types.zi"; #import, file "../src/app/metrics.zi"; +#import, file "../src/app/theme_catalog.zi"; #import "drawing_props" #import "style_sheet" #import "style" +#program_export +StartupStyleCheck :: () -> s32 { + for theme: 0..ThemeCount - 1 { + for style: 1..3 { + if !StyleInstall(cast(s32)theme, false, cast(s32)style) || + !StyleInstall(cast(s32)theme, true, cast(s32)style) { + return 1 + } + } + } + return 42 +} + #program_export Answer :: () -> s32 { app: InnerBreeze @@ -21,7 +35,7 @@ Answer :: () -> s32 { if face.background != cast(u32)0xE2EEFCFF { return 3 } canvas := StyleTokenColor("canvas") if canvas.r != 0xE2 || canvas.g != 0xEE || - canvas.b != 0xFC || canvas.a != 0xFF { return 8 } + canvas.b != 0xFC || canvas.a != 0xFF { return 8 } image_face := ResolveStyleRules(rules, base, StyleDefaultFacts(StyleKindImage()), 1) if image_face.background != cast(u32)0 { return 7 } @@ -34,19 +48,19 @@ Answer :: () -> s32 { if face.background != cast(u32)0x182838FF { return 5 } canvas = StyleTokenColor("canvas") if canvas.r != 0x18 || canvas.g != 0x28 || - canvas.b != 0x38 || canvas.a != 0xFF { return 9 } + canvas.b != 0x38 || canvas.a != 0xFF { return 9 } app.style_index = 3 app.dark_mode = 0 if !app_apply_style(*app) || style_pack_has_glow(3) != 1 || - style_pack_id(3) != "lightfield" { return 6 } + style_pack_id(3) != "lightfield" { return 6 } // Unchanged inputs keep the installed style; changed ones replace it. app.style_index = 1 if !app_apply_style(*app) || !app_apply_style(*app) { return 10 } canvas = StyleTokenColor("canvas") if canvas.r != 0xE2 || canvas.g != 0xEE || - canvas.b != 0xFC || canvas.a != 0xFF { return 11 } + canvas.b != 0xFC || canvas.a != 0xFF { return 11 } if ActiveStyleRules().count < 20 { return 12 } return 42 } diff --git a/tests/style_apply_link_test.c b/tests/style_apply_link_test.c index 9c2cb1425..061fdd402 100644 --- a/tests/style_apply_link_test.c +++ b/tests/style_apply_link_test.c @@ -1,10 +1,30 @@ +#define _POSIX_C_SOURCE 200809L #include "style_apply_link_behavior.h" #include +#include + +static void * +startup(void *argument) +{ + (void)argument; + assert(StartupStyleCheck() == 42); + return NULL; +} int main(void) { + pthread_attr_t attributes; + pthread_t thread; + + /* Android native threads have much smaller stacks than the host main + * thread. Exercise the entire startup parser chain within that budget. */ + assert(pthread_attr_init(&attributes) == 0); + assert(pthread_attr_setstacksize(&attributes, 1024 * 1024) == 0); + assert(pthread_create(&thread, &attributes, startup, NULL) == 0); + assert(pthread_join(thread, NULL) == 0); + assert(pthread_attr_destroy(&attributes) == 0); assert(Answer() == 42); return 0; } diff --git a/tests/style_apply_zi_test.sh b/tests/style_apply_zi_test.sh index b7336f453..ab5425e0f 100644 --- a/tests/style_apply_zi_test.sh +++ b/tests/style_apply_zi_test.sh @@ -19,7 +19,7 @@ python3 "$root/scripts/embed-app-assets.py" "$work/assets.c" \ "$root/build/packages/kss/styles/classic.kss" \ "$root/build/packages/kss/styles/lightfield.kss" \ "$root/assets/styles/inbe.kss" -"${CC:-cc}" -std=c11 -DZIRAN_BOUNDS_CHECK -ffunction-sections \ +"${CC:-cc}" -std=c11 -Os -pthread -DZIRAN_BOUNDS_CHECK -ffunction-sections \ -fdata-sections -Wl,--gc-sections \ -I"$root/build/packages/ziran/include" -I"$work/c" -I"$root/src/app" \ "$root/tests/style_apply_link_test.c" \ diff --git a/windows/inbe.rc b/windows/inbe.rc index c4b20034d..e99b04141 100644 --- a/windows/inbe.rc +++ b/windows/inbe.rc @@ -6,8 +6,8 @@ IDI_APP_ICON ICON "inbe.ico" IDI_NOTIFICATION_ICON ICON "inbe.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,7,0 - PRODUCTVERSION 2,0,7,0 + FILEVERSION 2,0,8,0 + PRODUCTVERSION 2,0,8,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,11 +24,11 @@ BEGIN BEGIN VALUE "CompanyName", "waozi" VALUE "FileDescription", "Inner Breeze" - VALUE "FileVersion", "2.0.7" + VALUE "FileVersion", "2.0.8" VALUE "InternalName", "inbe" VALUE "OriginalFilename", "inbe-windows-x86_64.exe" VALUE "ProductName", "Inner Breeze" - VALUE "ProductVersion", "2.0.7" + VALUE "ProductVersion", "2.0.8" END END BLOCK "VarFileInfo" diff --git a/ziran.lock b/ziran.lock index d168cccb3..65cb8a443 100644 --- a/ziran.lock +++ b/ziran.lock @@ -55,7 +55,7 @@ }, { "commit": "396f1efedb702b1aacdd724a7b611302d95a0adc", - "dependencies": {"kryon": "pdd4c1b6242bac10f"}, + "dependencies": {"kryon": "pfded054c5bfac236"}, "id": "p7b9204ab0ad2089f", "name": "Game2D", "ref": "master", @@ -80,16 +80,16 @@ "url": "https://github.com/LoupVaillant/Monocypher.git" }, { - "commit": "569aa0a6c17d33d68e5f8177807d41b154d98054", + "commit": "6a0d4834546355a03686aedbef424a1b330a81e6", "dependencies": {"raylib": "p5a77c9c35110e925"}, - "id": "pdd4c1b6242bac10f", + "id": "pfded054c5bfac236", "name": "kryon", "ref": "master", "url": "https://github.com/kryonlabs/kryon.git" }, { "commit": "e1f07e615e9255a513dbb6d66e5e6e9d335ef690", - "dependencies": {"kryon": "pdd4c1b6242bac10f"}, + "dependencies": {"kryon": "pfded054c5bfac236"}, "id": "pfdf70946e0505dfe", "name": "Kss", "ref": "master", @@ -97,11 +97,11 @@ } ], "root": { - "dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p7b9204ab0ad2089f", "kryon": "pdd4c1b6242bac10f", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "oqs": "p1b5dd8d89e3ab867", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"}, + "dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p7b9204ab0ad2089f", "kryon": "pfded054c5bfac236", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "oqs": "p1b5dd8d89e3ab867", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"}, "name": "Inbe" }, "toolchain": { - "commit": "aa6b05d949fa10d6ef90a4b015c1f757b0029da1", + "commit": "bd63cd15f91cd7afdfba6606248dbe1d1717da41", "ref": "master", "url": "https://github.com/ziranlang/ziran.git" }