diff --git a/CHANGELOG.md b/CHANGELOG.md index d54d357c5..17e3b76d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ - Keep Sun Salutation repetitions and tempo, and Tai Chi lesson details, in linked habit sessions and across account sync. - About lists only installed apps; published apps appear in More apps without a beta setting. - Start installed practices reliably from Lumi while their content opens. +- See Dew and activity directly in Profile, with data management inside the Dew card. +- Achievement alerts name the award at the top right and can be turned off. ## [2.1.41] - 2026-10-22 diff --git a/docs/build-laws.md b/docs/build-laws.md index 41dce09aa..58a6bca66 100644 --- a/docs/build-laws.md +++ b/docs/build-laws.md @@ -1,8 +1,7 @@ # Build laws in Ziran -Every Inbe law is stated, implemented, and checked in Ziran. Bend, its Node.js -checker, and the generated `.zi` tables are gone. This reference describes the -checked behavior, enforcement and limits. +Every Inbe law is stated, implemented, and checked in Ziran. This reference +describes the checked behavior, enforcement and limits. ## Implemented @@ -72,8 +71,8 @@ those effects separately. `make build-laws` runs the version check and `ziran check` on each module in `LAW_MODULES`. Failed checking prevents compilation; no old generated output can -satisfy it because none exists. Gradle and CMake run the same checks. Node is no -longer required to build, and the Flatpak no longer carries a Node build tool. +satisfy it because none exists. Gradle and CMake run the same checks. Native +builds and Flatpak use the locked Ziran toolchain; browser tests also need Node. - `make proof-test` runs `tests/law_mutation_test.sh`: the unmutated tree passes, and eight deliberate breakages (a changed result code, delay, diff --git a/docs/cells.md b/docs/cells.md index f87ee0870..74cb169b2 100644 --- a/docs/cells.md +++ b/docs/cells.md @@ -821,8 +821,11 @@ A release names one fixed commit while peers keep working on master: directories, so later edits, new files and commits cannot enter the run. Outputs stay in `build/release-ready/`. 3. Build the Moto APK in the same fixed-source overlay and save its content - identity and SHA-256 build receipt. With the development app closed by - the owner, run `make release REVISION=COMMIT APK=PATH BUILD_RECEIPT=PATH`. + identity and SHA-256 build receipt. Use `ANDROID_VERIFY_INSTANCE=1` for + the separate `xyz.waozi.inbe.verification` debug instance when the owner's + regular app is running; it has its own process and private data. This + option is rejected for production packages. Run + `make release REVISION=COMMIT APK=PATH BUILD_RECEIPT=PATH`. The exact APK must pass the minute-long practice and resume check; physical-phone images use Harmony's owner-only review. The command checks both the local gate stamp and APK provenance against the fixed candidate. diff --git a/droid/app/build.gradle b/droid/app/build.gradle index d23218d74..412bb7cac 100644 --- a/droid/app/build.gradle +++ b/droid/app/build.gradle @@ -13,6 +13,13 @@ if (hasGplayFirebaseConfig) { } } def appOnlyAbi = (project.findProperty('app.onlyAbi') ?: '').toString() +def verificationInstance = (project.findProperty('app.verificationInstance') ?: 'false').toString().toBoolean() +if (verificationInstance && gradle.startParameter.taskNames.any { + def name = it.toLowerCase() + name.contains('release') || name.contains('gplay') || name.contains('bundle') +}) { + throw new GradleException('The verification instance is only available for debug APK checks') +} def buildingAndroidBundle = gradle.startParameter.taskNames.any { it.toLowerCase().contains("bundle") } def kryonDirOverride = (project.findProperty('kryon.dir') ?: System.getenv("KRYON_DIR") ?: '').toString() @@ -104,13 +111,14 @@ android { buildConfigField "String", "UPDATE_FEED", '""' } debug { - applicationIdSuffix ".debug" + // Device verification must not replace or restart the owner's debug app. + applicationIdSuffix verificationInstance ? ".verification" : ".debug" signingConfig signingConfigs.debug buildConfigField "boolean", "GPLAY", "false" // Debug builds update only from a test feed: -Papp.updateFeed=URL. buildConfigField "boolean", "SELF_UPDATE", project.hasProperty('app.updateFeed') ? "true" : "false" buildConfigField "String", "UPDATE_FEED", '"' + (project.findProperty('app.updateFeed') ?: '') + '"' - manifestPlaceholders.inbeAppLabel = "Inner Breeze Debug" + manifestPlaceholders.inbeAppLabel = verificationInstance ? "Inner Breeze Verification" : "Inner Breeze Debug" manifestPlaceholders.inbeUsesCleartextTraffic = "true" } } diff --git a/fastlane/metadata/android/en-US/changelogs/179.txt b/fastlane/metadata/android/en-US/changelogs/179.txt index d89543a77..24027fd7b 100644 --- a/fastlane/metadata/android/en-US/changelogs/179.txt +++ b/fastlane/metadata/android/en-US/changelogs/179.txt @@ -6,3 +6,5 @@ - Keep Sun Salutation repetitions and tempo, and Tai Chi lesson details, in linked habit sessions and across account sync. - About lists only installed apps; published apps appear in More apps without a beta setting. - Start installed practices reliably from Lumi while their content opens. +- See Dew and activity directly in Profile, with data management inside the Dew card. +- Achievement alerts name the award at the top right and can be turned off. diff --git a/mk/android.mk b/mk/android.mk index 942aad184..4821a52da 100644 --- a/mk/android.mk +++ b/mk/android.mk @@ -39,7 +39,7 @@ android-local-properties: @printf 'sdk.dir=%s\ncmake.dir=%s\n' "$(ANDROID_SDK)" "$(ANDROID_CMAKE_DIR)" > droid/local.properties android-debug: android-copy-assets android-local-properties - $(ANDROID_GRADLE_ENV) $(GRADLE) -p droid assembleDebug $(if $(ANDROID_ABI),-Papp.onlyAbi="$(ANDROID_ABI)") $(ANDROID_GRADLE_ARGS) + $(ANDROID_GRADLE_ENV) $(GRADLE) -p droid assembleDebug $(if $(ANDROID_ABI),-Papp.onlyAbi="$(ANDROID_ABI)") $(if $(ANDROID_VERIFY_INSTANCE),-Papp.verificationInstance=true) $(ANDROID_GRADLE_ARGS) $(MAKE) android-copy-debug-apks android-release: diff --git a/scripts/phone-check.py b/scripts/phone-check.py index d57cfde9f..463d357c8 100644 --- a/scripts/phone-check.py +++ b/scripts/phone-check.py @@ -124,7 +124,7 @@ class Phone: try: return self.shell("pidof", package).strip() except subprocess.CalledProcessError as error: - if error.returncode == 1 and not error.stdout: + if error.returncode == 1 and not error.stdout and not error.stderr: return "" raise @@ -398,7 +398,7 @@ def main(): limits=dict(minimum_refresh_share=MINIMUM_REFRESH_SHARE, maximum_late_percent=MAXIMUM_LATE_PERCENT, maximum_frame_ms=MAXIMUM_FRAME_MS, maximum_resume_layout_shift=MAXIMUM_RESUME_LAYOUT_SHIFT), - checks=["installed over the existing app", "launch", "Wim Hof frame timing", + checks=["installed without clearing existing data", "launch", "Wim Hof frame timing", "background and resume"], passed=passed, checked_at=datetime.now(timezone.utc).isoformat(timespec="seconds")) (evidence / "receipt.json").write_text(json.dumps(receipt, indent=2) + "\n") diff --git a/tests/phone_check_gate_test.py b/tests/phone_check_gate_test.py index 88e263f0f..f5c1d0fef 100644 --- a/tests/phone_check_gate_test.py +++ b/tests/phone_check_gate_test.py @@ -106,6 +106,10 @@ class PhoneCheckGateTest(unittest.TestCase): 1, ["adb"], output=b"device offline")): with self.assertRaises(subprocess.CalledProcessError): phone.pid("fixture.debug") + with mock.patch.object(phone, "shell", side_effect=subprocess.CalledProcessError( + 1, ["adb"], output=b"", stderr=b"device offline")): + with self.assertRaises(subprocess.CalledProcessError): + phone.pid("fixture.debug") def test_docs_tests_and_tooling_may_change_after_the_check(self): self.record()