fix(android): make every Zig decline speak, and prove Zig answers

.github/workflows/README.mdmodified+6-1

Changes to .github/workflows/README.md

		⋯49 linesShow the 49 lines above this hunk@@ -50,9 +50,14 @@ bun run test:mobile-e2e:android
50	50
51	51	```
52	52	ok android-shim — 4/4 cases, no zig
53		-ok android-runtime — 4/4 cases, zig served registered:59
	53	+ok android-runtime — 4/4 cases, zig served registered:103, declines:0
54	54	```
55	55
	56	+The runtime leg fails on any line where a Zig native gave up — "fell through
	57	+to the shim", "failed with no fallback" or "could not reach the page" — because
	58	+Kotlin answering in its place is invisible to the page, and a runtime that has
	59	+loaded but is not answering would otherwise pass.
	60	+
56	61	Both write everything they saw — console logs, build logs, a screenshot, the
57	62	exact page that ran and a `report.json` — to
58	63	`artifacts/mobile-e2e/<label>/`, which is what CI uploads.

packages/zig/build.zigmodified+17-0

Changes to packages/zig/build.zig

		⋯627 linesShow the 627 lines above this hunk@@ -628,6 +628,21 @@ pub fn build(b: *std.Build) void {
628	628	});
629	629	const run_android_escaping_tests = b.addRunArtifact(android_escaping_tests);
630	630
	631	+ // Every way a native gives up has to say so. See the file for why: a
	632	+ // decline to the Kotlin shim is invisible to the page, which made
	633	+ // ~170 silent `catch return null` paths invisible to everyone.
	634	+ const android_declines_tests = b.addTest(.{
	635	+ .root_module = b.createModule(.{
	636	+ .root_source_file = b.path("test/android_declines_test.zig"),
	637	+ .target = target,
	638	+ .optimize = optimize,
	639	+ }),
	640	+ });
	641	+ android_declines_tests.root_module.addAnonymousImport("android_dispatch.zig", .{
	642	+ .root_source_file = b.path("src/android_dispatch.zig"),
	643	+ });
	644	+ const run_android_declines_tests = b.addRunArtifact(android_declines_tests);
	645	+
631	646	ios_conformance_tests.root_module.addAnonymousImport("CraftApp.swift", .{
632	647	.root_source_file = b.path("../ios/templates/CraftApp.swift"),
633	648	});
		⋯1,165 linesShow the 1,165 lines above this hunk@@ -1799,6 +1814,7 @@ pub fn build(b: *std.Build) void {
1799	1814	test_step.dependOn(&run_android_conformance_tests.step);
1800	1815	test_step.dependOn(&run_android_bridge_tests.step);
1801	1816	test_step.dependOn(&run_android_escaping_tests.step);
	1817	+ test_step.dependOn(&run_android_declines_tests.step);
1802	1818	test_step.dependOn(&run_menubar_tests.step);
1803	1819	test_step.dependOn(&run_components_tests.step);
1804	1820	test_step.dependOn(&run_gpu_tests.step);
		⋯757 linesShow the 757 lines above this hunk@@ -2562,6 +2578,7 @@ pub fn build(b: *std.Build) void {
2562	2578	test_android_step.dependOn(&run_android_conformance_tests.step);
2563	2579	test_android_step.dependOn(&run_android_bridge_tests.step);
2564	2580	test_android_step.dependOn(&run_android_escaping_tests.step);
	2581	+ test_android_step.dependOn(&run_android_declines_tests.step);
2565	2582
2566	2583	// Add Android tests to the main test step
2567	2584	test_step.dependOn(&run_android_tests.step);

packages/zig/src/android_dispatch.zigmodified+271-239

Changes to packages/zig/src/android_dispatch.zig

		⋯100 linesShow the 100 lines above this hunk@@ -101,6 +101,46 @@ const Jni = jni.Jni;
101	101	/// individually on the way out.
102	102	const backing = std.heap.page_allocator;
103	103
	104	+// =============================================================================
	105	+// Declines, said out loud
	106	+// =============================================================================
	107	+//
	108	+// Every way a native can give up goes through one of these three, and each
	109	+// says something different because each *means* something different:
	110	+//
	111	+// - `fellThrough`: a native with a return value gave the action back to the
	112	+// Kotlin shim. The page still gets an answer; Zig just did not produce it.
	113	+// - `failedWithoutFallback`: a callback into Zig gave up early. Zig owns the
	114	+// operation by then, so nothing picks it up, and whatever the page is waiting
	115	+// on will not arrive.
	116	+// - `undelivered`: Zig had an answer and could not get it to the page — the
	117	+// settle, reject or event failed, and that promise will not settle.
	118	+//
	119	+// These used to be ~170 bare `catch return null` / `catch {}`. On a device
	120	+// they were indistinguishable from a native doing its job, which is how
	121	+// `getDeviceInfo` ran on its first emulator for a whole CI cycle throwing
	122	+// `NoSuchFieldError` and handing every call to Kotlin without the page, the
	123	+// suite or the logs noticing. `test/android_declines_test.zig` keeps them from
	124	+// coming back, and the mobile E2E runtime leg fails on any of these lines.
	125	+
	126	+/// A native handing the action back to Kotlin because something it needed
	127	+/// failed. Returns `declined` — null or `JNI_FALSE` — so it reads as the value
	128	+/// the native was always going to return.
	129	+fn fellThrough(comptime action: []const u8, err: anyerror, declined: anytype) @TypeOf(declined) {
	130	+ std.log.warn("craft: " ++ action ++ " fell through to the shim ({s})", .{@errorName(err)});
	131	+ return declined;
	132	+}
	133	+
	134	+/// A callback into Zig giving up with nothing to fall back to.
	135	+fn failedWithoutFallback(comptime action: []const u8, err: anyerror) void {
	136	+ std.log.err("craft: " ++ action ++ " failed with no fallback ({s})", .{@errorName(err)});
	137	+}
	138	+
	139	+/// An answer that could not be delivered to the page.
	140	+fn undelivered(comptime action: []const u8, err: anyerror) void {
	141	+ std.log.err("craft: " ++ action ++ " could not reach the page ({s})", .{@errorName(err)});
	142	+}
	143	+
104	144	/// `CraftBridge.REQUEST_CALENDAR`, the request code the shim passes.
105	145	///
106	146	/// It has to match, because it is the only thing that would tell an
		⋯614 linesShow the 614 lines above this hunk@@ -721,12 +761,12 @@ fn nativeGetDeviceInfo(env: jni.JNIEnv, _: jni.jobject, activity: jni.jobject) c
721	761	return null;
722	762	};
723	763
724		- const json = device.render(allocator, info) catch return null;
	764	+ const json = device.render(allocator, info) catch |err| return fellThrough("getDeviceInfo", err, @as(jni.jstring, null));
725	765
726	766	// Re-encoded rather than handed over: this JSON carries device text — a
727	767	// model name, a carrier — and `NewStringUTF` reads modified UTF-8, where a
728	768	// NUL is two bytes and an astral character is a surrogate pair.
729		- return j.newStringUtf8(allocator, json) catch null;
	769	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("getDeviceInfo", err, @as(jni.jstring, null));
730	770	}
731	771
732	772	/// `nativeGetMemoryUsage()` — the JVM heap, as JSON.
		⋯9 linesShow the 9 lines above this hunk@@ -742,8 +782,8 @@ fn nativeGetMemoryUsage(env: jni.JNIEnv, _: jni.jobject) callconv(.c) jni.jstrin
742	782	return null;
743	783	};
744	784
745		- const json = system.renderMemory(allocator, usage) catch return null;
746		- return j.newStringUtf8(allocator, json) catch null;
	785	+ const json = system.renderMemory(allocator, usage) catch |err| return fellThrough("getMemoryUsage", err, @as(jni.jstring, null));
	786	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("getMemoryUsage", err, @as(jni.jstring, null));
747	787	}
748	788
749	789	/// `nativeLog(message)` — returns whether Zig wrote the line.
		⋯8 linesShow the 8 lines above this hunk@@ -758,7 +798,7 @@ fn nativeLog(env: jni.JNIEnv, _: jni.jobject, message: jni.jstring) callconv(.c)
758	798	defer arena.deinit();
759	799	const allocator = arena.allocator();
760	800
761		- const text = j.stringToUtf8(allocator, message) catch return jni.JNI_FALSE;
	801	+ const text = j.stringToUtf8(allocator, message) catch |err| return fellThrough("log", err, jni.JNI_FALSE);
762	802
763	803	system.writeLog(j, allocator, text) catch |err| {
764	804	std.log.warn("craft: log fell through to the shim ({s})", .{@errorName(err)});
		⋯19 linesShow the 19 lines above this hunk@@ -784,7 +824,7 @@ fn nativeClipboardRead(env: jni.JNIEnv, _: jni.jobject, activity: jni.jobject) c
784	824	return null;
785	825	};
786	826
787		- return j.newStringUtf8(allocator, text) catch null;
	827	+ return j.newStringUtf8(allocator, text) catch |err| fellThrough("clipboardRead", err, @as(jni.jstring, null));
788	828	}
789	829
790	830	/// `nativeClipboardWrite(activity, text)`.
		⋯9 linesShow the 9 lines above this hunk@@ -800,7 +840,7 @@ fn nativeClipboardWrite(
800	840	defer arena.deinit();
801	841	const allocator = arena.allocator();
802	842
803		- const value = j.stringToUtf8(allocator, text) catch return jni.JNI_FALSE;
	843	+ const value = j.stringToUtf8(allocator, text) catch |err| return fellThrough("clipboardWrite", err, jni.JNI_FALSE);
804	844
805	845	clipboard.write(j, allocator, activity, value) catch |err| {
806	846	std.log.warn("craft: clipboardWrite fell through to the shim ({s})", .{@errorName(err)});
		⋯2 linesShow the 2 lines above this hunk@@ -809,15 +849,6 @@ fn nativeClipboardWrite(
809	849	return jni.JNI_TRUE;
810	850	}
811	851
812		-/// A `jstring` as arena-owned UTF-8, or null.
813		-///
814		-/// Every native below needs this and none of them can share the result, since
815		-/// each arena dies with its call. A plain slice: the JNI side re-encodes on
816		-/// the way back out, so nothing here has to carry a terminator.
817		-fn ownedUtf8(j: Jni, allocator: std.mem.Allocator, str: jni.jstring) ?[]u8 {
818		- return j.stringToUtf8(allocator, str) catch null;
819		-}
820		-
821	852	fn nativeOpenUrl(
822	853	env: jni.JNIEnv,
823	854	_: jni.jobject,
		⋯6 linesShow the 6 lines above this hunk@@ -830,7 +861,7 @@ fn nativeOpenUrl(
830	861
831	862	const allocator = arena.allocator();
832	863
833		- const value = ownedUtf8(j, allocator, url) orelse return jni.JNI_FALSE;
	864	+ const value = j.stringToUtf8(allocator, url) catch |err| return fellThrough("openUrl", err, jni.JNI_FALSE);
834	865	intents.openUrl(j, allocator, activity, value) catch |err| {
835	866	// Not a warning. `openURL` answering false is the documented outcome
836	867	// when nothing on the device handles the scheme, and the Kotlin
		⋯17 linesShow the 17 lines above this hunk@@ -854,8 +885,8 @@ fn nativeShare(
854	885	defer arena.deinit();
855	886	const allocator = arena.allocator();
856	887
857		- const body = ownedUtf8(j, allocator, text) orelse return jni.JNI_FALSE;
858		- const subject = ownedUtf8(j, allocator, title) orelse return jni.JNI_FALSE;
	888	+ const body = j.stringToUtf8(allocator, text) catch |err| return fellThrough("share", err, jni.JNI_FALSE);
	889	+ const subject = j.stringToUtf8(allocator, title) catch |err| return fellThrough("share", err, jni.JNI_FALSE);
859	890
860	891	intents.share(j, allocator, activity, body, subject) catch |err| {
861	892	std.log.warn("craft: share fell through to the shim ({s})", .{@errorName(err)});
		⋯55 linesShow the 55 lines above this hunk@@ -917,7 +948,7 @@ fn nativeStartVideoRecording(
917	948	}
918	949
919	950	fn nativeReviewSucceeded(_: jni.JNIEnv, _: jni.jobject) callconv(.c) void {
920		- events.settle(backing, review.resolve_global, "true") catch {};
	951	+ events.settle(backing, review.resolve_global, "true") catch |err| undelivered("reviewSucceeded", err);
921	952	}
922	953
923	954	fn nativeReviewError(
		⋯6 linesShow the 6 lines above this hunk@@ -930,9 +961,9 @@ fn nativeReviewError(
930	961	defer arena.deinit();
931	962	const allocator = arena.allocator();
932	963
933		- const text = j.stringToUtf8(allocator, message) catch return;
934		- const payload = review.rejectionPayload(allocator, text) catch return;
935		- events.settle(allocator, review.reject_global, payload) catch {};
	964	+ const text = j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("reviewError", err);
	965	+ const payload = review.rejectionPayload(allocator, text) catch |err| return failedWithoutFallback("reviewError", err);
	966	+ events.settle(allocator, review.reject_global, payload) catch |err| undelivered("reviewError", err);
936	967	}
937	968
938	969	fn nativeRequestReview(
		⋯9 linesShow the 9 lines above this hunk@@ -948,7 +979,8 @@ fn nativeRequestReview(
948	979	}
949	980
950	981	fn speechHaptic(j: Jni, activity: jni.jobject) void {
951		- haptics.play(j, activity, haptics.effectForStyle("light")) catch {};
	982	+ haptics.play(j, activity, haptics.effectForStyle("light")) catch |err|
	983	+ std.log.warn("craft: speech start haptic skipped ({s})", .{@errorName(err)});
952	984	}
953	985
954	986	fn nativeSpeechReady(
		⋯1 lineShow the 1 line above this hunk@@ -956,7 +988,7 @@ fn nativeSpeechReady(
956	988	_: jni.jobject,
957	989	activity: jni.jobject,
958	990	) callconv(.c) void {
959		- events.emitEvent(backing, speech.start_event, "{}") catch {};
	991	+ events.emitEvent(backing, speech.start_event, "{}") catch |err| undelivered("speechReady", err);
960	992	speechHaptic(Jni.init(env), activity);
961	993	}
962	994
		⋯7 linesShow the 7 lines above this hunk@@ -970,8 +1002,8 @@ fn nativeSpeechError(
970	1002	defer arena.deinit();
971	1003	const allocator = arena.allocator();
972	1004
973		- const detail = speech.errorDetail(allocator, speech.errorMessage(error_code)) catch return;
974		- events.emitEvent(allocator, speech.error_event, detail) catch {};
	1005	+ const detail = speech.errorDetail(allocator, speech.errorMessage(error_code)) catch |err| return failedWithoutFallback("speechError", err);
	1006	+ events.emitEvent(allocator, speech.error_event, detail) catch |err| undelivered("speechError", err);
975	1007	speechHaptic(Jni.init(env), activity);
976	1008	}
977	1009
		⋯9 linesShow the 9 lines above this hunk@@ -987,12 +1019,12 @@ fn nativeSpeechResult(
987	1019	defer arena.deinit();
988	1020	const allocator = arena.allocator();
989	1021
990		- const text = j.stringToUtf8(allocator, transcript) catch return;
	1022	+ const text = j.stringToUtf8(allocator, transcript) catch |err| return failedWithoutFallback("speechResult", err);
991	1023	const final = is_final == jni.JNI_TRUE;
992		- const detail = speech.resultDetail(allocator, text, final) catch return;
993		- events.emitEvent(allocator, speech.result_event, detail) catch {};
	1024	+ const detail = speech.resultDetail(allocator, text, final) catch |err| return failedWithoutFallback("speechResult", err);
	1025	+ events.emitEvent(allocator, speech.result_event, detail) catch |err| undelivered("speechResult", err);
994	1026	if (final) {
995		- events.emitEvent(allocator, speech.end_event, "{}") catch {};
	1027	+ events.emitEvent(allocator, speech.end_event, "{}") catch |err| undelivered("speechResult", err);
996	1028	speechHaptic(j, activity);
997	1029	}
998	1030	}
		⋯8 linesShow the 8 lines above this hunk@@ -1007,19 +1039,19 @@ fn nativeStartListening(
1007	1039	var arena = std.heap.ArenaAllocator.init(backing);
1008	1040	defer arena.deinit();
1009	1041	const allocator = arena.allocator();
1010		- const detail = speech.errorDetail(allocator, speech.unavailable) catch return jni.JNI_FALSE;
1011		- events.emitEvent(allocator, speech.error_event, detail) catch return jni.JNI_FALSE;
	1042	+ const detail = speech.errorDetail(allocator, speech.unavailable) catch |err| return fellThrough("startListening", err, jni.JNI_FALSE);
	1043	+ events.emitEvent(allocator, speech.error_event, detail) catch |err| return fellThrough("startListening", err, jni.JNI_FALSE);
1012	1044	return jni.JNI_TRUE;
1013	1045	}
1014	1046
1015	1047	const j = Jni.init(env);
1016		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1048	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("startListening", err, jni.JNI_FALSE);
1017	1049	j.callStaticVoidMethodA(
1018	1050	holder,
1019	1051	j.staticMethodId(holder, "beginSpeechRecognition", "(Landroid/app/Activity;)V") catch
1020	1052	return jni.JNI_FALSE,
1021	1053	&.{.{ .l = activity }},
1022		- ) catch return jni.JNI_FALSE;
	1054	+ ) catch |err| return fellThrough("startListening", err, jni.JNI_FALSE);
1023	1055	return jni.JNI_TRUE;
1024	1056	}
1025	1057
		⋯3 linesShow the 3 lines above this hunk@@ -1029,18 +1061,18 @@ fn nativeStopListening(
1029	1061	activity: jni.jobject,
1030	1062	) callconv(.c) jni.jboolean {
1031	1063	const j = Jni.init(env);
1032		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1064	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("stopListening", err, jni.JNI_FALSE);
1033	1065	j.callStaticVoidMethodA(
1034	1066	holder,
1035	1067	j.staticMethodId(holder, "endSpeechRecognition", "(Landroid/app/Activity;)V") catch
1036	1068	return jni.JNI_FALSE,
1037	1069	&.{.{ .l = activity }},
1038		- ) catch return jni.JNI_FALSE;
	1070	+ ) catch |err| return fellThrough("stopListening", err, jni.JNI_FALSE);
1039	1071	return jni.JNI_TRUE;
1040	1072	}
1041	1073
1042	1074	fn nativeAudioStarted(_: jni.JNIEnv, _: jni.jobject) callconv(.c) void {
1043		- events.settle(backing, audio.start_resolve_global, "true") catch {};
	1075	+ events.settle(backing, audio.start_resolve_global, "true") catch |err| undelivered("audioStarted", err);
1044	1076	}
1045	1077
1046	1078	fn settleAudioError(env: jni.JNIEnv, global: []const u8, message: jni.jstring) void {
		⋯2 linesShow the 2 lines above this hunk@@ -1049,9 +1081,9 @@ fn settleAudioError(env: jni.JNIEnv, global: []const u8, message: jni.jstring) v
1049	1081	defer arena.deinit();
1050	1082	const allocator = arena.allocator();
1051	1083
1052		- const text = j.stringToUtf8(allocator, message) catch return;
1053		- const payload = audio.stringPayload(allocator, text) catch return;
1054		- events.settle(allocator, global, payload) catch {};
	1084	+ const text = j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("settleAudioError", err);
	1085	+ const payload = audio.stringPayload(allocator, text) catch |err| return failedWithoutFallback("settleAudioError", err);
	1086	+ events.settle(allocator, global, payload) catch |err| undelivered("settleAudioError", err);
1055	1087	}
1056	1088
1057	1089	fn nativeAudioStartError(
		⋯14 linesShow the 14 lines above this hunk@@ -1072,9 +1104,9 @@ fn nativeAudioStopped(
1072	1104	defer arena.deinit();
1073	1105	const allocator = arena.allocator();
1074	1106
1075		- const raw = j.byteArrayToOwned(allocator, bytes) catch return;
1076		- const payload = audio.recordingPayload(allocator, raw) catch return;
1077		- events.settle(allocator, audio.stop_resolve_global, payload) catch {};
	1107	+ const raw = j.byteArrayToOwned(allocator, bytes) catch |err| return failedWithoutFallback("audioStopped", err);
	1108	+ const payload = audio.recordingPayload(allocator, raw) catch |err| return failedWithoutFallback("audioStopped", err);
	1109	+ events.settle(allocator, audio.stop_resolve_global, payload) catch |err| undelivered("audioStopped", err);
1078	1110	}
1079	1111
1080	1112	fn nativeAudioStopError(
		⋯24 linesShow the 24 lines above this hunk@@ -1105,13 +1137,13 @@ fn nativeStartAudioRecording(
1105	1137	return jni.JNI_TRUE;
1106	1138	}
1107	1139
1108		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1140	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("startAudioRecording", err, jni.JNI_FALSE);
1109	1141	j.callStaticVoidMethodA(
1110	1142	holder,
1111	1143	j.staticMethodId(holder, "beginAudioRecording", "(Landroid/app/Activity;)V") catch
1112	1144	return jni.JNI_FALSE,
1113	1145	&.{.{ .l = activity }},
1114		- ) catch return jni.JNI_FALSE;
	1146	+ ) catch |err| return fellThrough("startAudioRecording", err, jni.JNI_FALSE);
1115	1147	return jni.JNI_TRUE;
1116	1148	}
1117	1149
		⋯3 linesShow the 3 lines above this hunk@@ -1121,12 +1153,12 @@ fn nativeStopAudioRecording(
1121	1153	_: jni.jobject,
1122	1154	) callconv(.c) jni.jboolean {
1123	1155	const j = Jni.init(env);
1124		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1156	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("stopAudioRecording", err, jni.JNI_FALSE);
1125	1157	j.callStaticVoidMethodA(
1126	1158	holder,
1127		- j.staticMethodId(holder, "endAudioRecording", "()V") catch return jni.JNI_FALSE,
	1159	+ j.staticMethodId(holder, "endAudioRecording", "()V") catch |err| return fellThrough("stopAudioRecording", err, jni.JNI_FALSE),
1128	1160	&.{},
1129		- ) catch return jni.JNI_FALSE;
	1161	+ ) catch |err| return fellThrough("stopAudioRecording", err, jni.JNI_FALSE);
1130	1162	return jni.JNI_TRUE;
1131	1163	}
1132	1164
		⋯4 linesShow the 4 lines above this hunk@@ -1137,13 +1169,13 @@ fn nativeResetDeepLinks(_: jni.JNIEnv, _: jni.jobject) callconv(.c) jni.jboolean
1137	1169
1138	1170	fn nativeSetInitialURL(env: jni.JNIEnv, _: jni.jobject, url: jni.jstring) callconv(.c) jni.jboolean {
1139	1171	if (url == null) {
1140		- deeplink.set(null) catch return jni.JNI_FALSE;
	1172	+ deeplink.set(null) catch |err| return fellThrough("setInitialURL", err, jni.JNI_FALSE);
1141	1173	return jni.JNI_TRUE;
1142	1174	}
1143	1175	var arena = std.heap.ArenaAllocator.init(backing);
1144	1176	defer arena.deinit();
1145		- const text = Jni.init(env).stringToUtf8(arena.allocator(), url) catch return jni.JNI_FALSE;
1146		- deeplink.set(text) catch return jni.JNI_FALSE;
	1177	+ const text = Jni.init(env).stringToUtf8(arena.allocator(), url) catch |err| return fellThrough("setInitialURL", err, jni.JNI_FALSE);
	1178	+ deeplink.set(text) catch |err| return fellThrough("setInitialURL", err, jni.JNI_FALSE);
1147	1179	return jni.JNI_TRUE;
1148	1180	}
1149	1181
		⋯2 linesShow the 2 lines above this hunk@@ -1152,9 +1184,9 @@ fn nativeGetInitialURL(env: jni.JNIEnv, _: jni.jobject) callconv(.c) jni.jboolea
1152	1184	var arena = std.heap.ArenaAllocator.init(backing);
1153	1185	defer arena.deinit();
1154	1186	const allocator = arena.allocator();
1155		- const url = deeplink.snapshot(allocator) catch return jni.JNI_FALSE;
1156		- const result = if (url) |text| deeplink.payload(j, allocator, text) catch return jni.JNI_FALSE else "null";
1157		- events.settle(allocator, deeplink.resolve_global, result) catch return jni.JNI_FALSE;
	1187	+ const url = deeplink.snapshot(allocator) catch |err| return fellThrough("getInitialURL", err, jni.JNI_FALSE);
	1188	+ const result = if (url) |text| deeplink.payload(j, allocator, text) catch |err| return fellThrough("getInitialURL", err, jni.JNI_FALSE) else "null";
	1189	+ events.settle(allocator, deeplink.resolve_global, result) catch |err| return fellThrough("getInitialURL", err, jni.JNI_FALSE);
1158	1190	return jni.JNI_TRUE;
1159	1191	}
1160	1192
		⋯2 linesShow the 2 lines above this hunk@@ -1163,10 +1195,10 @@ fn nativeDispatchDeepLink(env: jni.JNIEnv, _: jni.jobject, url: jni.jstring) cal
1163	1195	var arena = std.heap.ArenaAllocator.init(backing);
1164	1196	defer arena.deinit();
1165	1197	const allocator = arena.allocator();
1166		- const text = j.stringToUtf8(allocator, url) catch return jni.JNI_FALSE;
1167		- deeplink.rememberFirst(text) catch return jni.JNI_FALSE;
1168		- const detail = deeplink.payload(j, allocator, text) catch return jni.JNI_FALSE;
1169		- events.emitEvent(allocator, deeplink.event_name, detail) catch return jni.JNI_FALSE;
	1198	+ const text = j.stringToUtf8(allocator, url) catch |err| return fellThrough("dispatchDeepLink", err, jni.JNI_FALSE);
	1199	+ deeplink.rememberFirst(text) catch |err| return fellThrough("dispatchDeepLink", err, jni.JNI_FALSE);
	1200	+ const detail = deeplink.payload(j, allocator, text) catch |err| return fellThrough("dispatchDeepLink", err, jni.JNI_FALSE);
	1201	+ events.emitEvent(allocator, deeplink.event_name, detail) catch |err| return fellThrough("dispatchDeepLink", err, jni.JNI_FALSE);
1170	1202	return jni.JNI_TRUE;
1171	1203	}
1172	1204
		⋯2 linesShow the 2 lines above this hunk@@ -1175,9 +1207,9 @@ fn nativeScreenshotReady(env: jni.JNIEnv, _: jni.jobject, bytes: jni.jobject) ca
1175	1207	var arena = std.heap.ArenaAllocator.init(backing);
1176	1208	defer arena.deinit();
1177	1209	const allocator = arena.allocator();
1178		- const raw = j.byteArrayToOwned(allocator, bytes) catch return;
1179		- const payload = screenshot.imagePayload(allocator, raw) catch return;
1180		- events.settle(allocator, screenshot.resolve_global, payload) catch {};
	1210	+ const raw = j.byteArrayToOwned(allocator, bytes) catch |err| return failedWithoutFallback("screenshotReady", err);
	1211	+ const payload = screenshot.imagePayload(allocator, raw) catch |err| return failedWithoutFallback("screenshotReady", err);
	1212	+ events.settle(allocator, screenshot.resolve_global, payload) catch |err| undelivered("screenshotReady", err);
1181	1213	}
1182	1214
1183	1215	fn nativeScreenshotError(env: jni.JNIEnv, _: jni.jobject, message: jni.jstring) callconv(.c) void {
		⋯1 lineShow the 1 line above this hunk@@ -1185,9 +1217,9 @@ fn nativeScreenshotError(env: jni.JNIEnv, _: jni.jobject, message: jni.jstring)
1185	1217	var arena = std.heap.ArenaAllocator.init(backing);
1186	1218	defer arena.deinit();
1187	1219	const allocator = arena.allocator();
1188		- const text = j.stringToUtf8(allocator, message) catch return;
1189		- const payload = screenshot.errorPayload(allocator, text) catch return;
1190		- events.settle(allocator, screenshot.reject_global, payload) catch {};
	1220	+ const text = j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("screenshotError", err);
	1221	+ const payload = screenshot.errorPayload(allocator, text) catch |err| return failedWithoutFallback("screenshotError", err);
	1222	+ events.settle(allocator, screenshot.reject_global, payload) catch |err| undelivered("screenshotError", err);
1191	1223	}
1192	1224
1193	1225	fn nativeTakeScreenshot(
		⋯3 linesShow the 3 lines above this hunk@@ -1197,13 +1229,13 @@ fn nativeTakeScreenshot(
1197	1229	web_view: jni.jobject,
1198	1230	) callconv(.c) jni.jboolean {
1199	1231	const j = Jni.init(env);
1200		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1232	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("takeScreenshot", err, jni.JNI_FALSE);
1201	1233	j.callStaticVoidMethodA(
1202	1234	holder,
1203	1235	j.staticMethodId(holder, "captureScreenshot", "(Landroid/app/Activity;Landroid/webkit/WebView;)V") catch
1204	1236	return jni.JNI_FALSE,
1205	1237	&.{ .{ .l = activity }, .{ .l = web_view } },
1206		- ) catch return jni.JNI_FALSE;
	1238	+ ) catch |err| return fellThrough("takeScreenshot", err, jni.JNI_FALSE);
1207	1239	return jni.JNI_TRUE;
1208	1240	}
1209	1241
		⋯1 lineShow the 1 line above this hunk@@ -1211,8 +1243,8 @@ fn settleRawString(env: jni.JNIEnv, global: []const u8, value: jni.jstring) void
1211	1243	const j = Jni.init(env);
1212	1244	var arena = std.heap.ArenaAllocator.init(backing);
1213	1245	defer arena.deinit();
1214		- const text = j.stringToUtf8(arena.allocator(), value) catch return;
1215		- events.settle(arena.allocator(), global, text) catch {};
	1246	+ const text = j.stringToUtf8(arena.allocator(), value) catch |err| return failedWithoutFallback("settleRawString", err);
	1247	+ events.settle(arena.allocator(), global, text) catch |err| undelivered("settleRawString", err);
1216	1248	}
1217	1249
1218	1250	fn settleBillingError(env: jni.JNIEnv, global: []const u8, value: jni.jstring) void {
		⋯1 lineShow the 1 line above this hunk@@ -1220,9 +1252,9 @@ fn settleBillingError(env: jni.JNIEnv, global: []const u8, value: jni.jstring) v
1220	1252	var arena = std.heap.ArenaAllocator.init(backing);
1221	1253	defer arena.deinit();
1222	1254	const allocator = arena.allocator();
1223		- const text = j.stringToUtf8(allocator, value) catch return;
1224		- const payload = billing.errorPayload(allocator, text) catch return;
1225		- events.settle(allocator, global, payload) catch {};
	1255	+ const text = j.stringToUtf8(allocator, value) catch |err| return failedWithoutFallback("settleBillingError", err);
	1256	+ const payload = billing.errorPayload(allocator, text) catch |err| return failedWithoutFallback("settleBillingError", err);
	1257	+ events.settle(allocator, global, payload) catch |err| undelivered("settleBillingError", err);
1226	1258	}
1227	1259
1228	1260	fn nativeProductsReady(env: jni.JNIEnv, _: jni.jobject, json: jni.jstring) callconv(.c) void {
		⋯16 linesShow the 16 lines above this hunk@@ -1245,12 +1277,12 @@ fn nativeGetProducts(
1245	1277	ids_json: jni.jstring,
1246	1278	) callconv(.c) jni.jboolean {
1247	1279	const j = Jni.init(env);
1248		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1280	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("getProducts", err, jni.JNI_FALSE);
1249	1281	j.callStaticVoidMethodA(
1250	1282	holder,
1251		- j.staticMethodId(holder, "queryProducts", "(Landroid/app/Activity;Ljava/lang/String;)V") catch return jni.JNI_FALSE,
	1283	+ j.staticMethodId(holder, "queryProducts", "(Landroid/app/Activity;Ljava/lang/String;)V") catch |err| return fellThrough("getProducts", err, jni.JNI_FALSE),
1252	1284	&.{ .{ .l = activity }, .{ .l = ids_json } },
1253		- ) catch return jni.JNI_FALSE;
	1285	+ ) catch |err| return fellThrough("getProducts", err, jni.JNI_FALSE);
1254	1286	return jni.JNI_TRUE;
1255	1287	}
1256	1288
		⋯3 linesShow the 3 lines above this hunk@@ -1260,12 +1292,12 @@ fn nativeRestorePurchases(
1260	1292	activity: jni.jobject,
1261	1293	) callconv(.c) jni.jboolean {
1262	1294	const j = Jni.init(env);
1263		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1295	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("restorePurchases", err, jni.JNI_FALSE);
1264	1296	j.callStaticVoidMethodA(
1265	1297	holder,
1266		- j.staticMethodId(holder, "queryRestoredPurchases", "(Landroid/app/Activity;)V") catch return jni.JNI_FALSE,
	1298	+ j.staticMethodId(holder, "queryRestoredPurchases", "(Landroid/app/Activity;)V") catch |err| return fellThrough("restorePurchases", err, jni.JNI_FALSE),
1267	1299	&.{.{ .l = activity }},
1268		- ) catch return jni.JNI_FALSE;
	1300	+ ) catch |err| return fellThrough("restorePurchases", err, jni.JNI_FALSE);
1269	1301	return jni.JNI_TRUE;
1270	1302	}
1271	1303
		⋯6 linesShow the 6 lines above this hunk@@ -1278,19 +1310,19 @@ fn nativeMlError(env: jni.JNIEnv, _: jni.jobject, message: jni.jstring) callconv
1278	1310	var arena = std.heap.ArenaAllocator.init(backing);
1279	1311	defer arena.deinit();
1280	1312	const allocator = arena.allocator();
1281		- const text = j.stringToUtf8(allocator, message) catch return;
1282		- const payload = ml.errorPayload(allocator, text) catch return;
1283		- events.settle(allocator, ml.reject_global, payload) catch {};
	1313	+ const text = j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("mlError", err);
	1314	+ const payload = ml.errorPayload(allocator, text) catch |err| return failedWithoutFallback("mlError", err);
	1315	+ events.settle(allocator, ml.reject_global, payload) catch |err| undelivered("mlError", err);
1284	1316	}
1285	1317
1286	1318	fn startMl(env: jni.JNIEnv, method: [*:0]const u8, image: jni.jstring) jni.jboolean {
1287	1319	const j = Jni.init(env);
1288		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1320	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("startMl", err, jni.JNI_FALSE);
1289	1321	j.callStaticVoidMethodA(
1290	1322	holder,
1291		- j.staticMethodId(holder, method, "(Ljava/lang/String;)V") catch return jni.JNI_FALSE,
	1323	+ j.staticMethodId(holder, method, "(Ljava/lang/String;)V") catch |err| return fellThrough("startMl", err, jni.JNI_FALSE),
1292	1324	&.{.{ .l = image }},
1293		- ) catch return jni.JNI_FALSE;
	1325	+ ) catch |err| return fellThrough("startMl", err, jni.JNI_FALSE);
1294	1326	return jni.JNI_TRUE;
1295	1327	}
1296	1328
		⋯10 linesShow the 10 lines above this hunk@@ -1307,7 +1339,7 @@ fn nativeRecognizeText(env: jni.JNIEnv, _: jni.jobject, image: jni.jstring) call
1307	1339	}
1308	1340
1309	1341	fn nativePdfOpened(_: jni.JNIEnv, _: jni.jobject) callconv(.c) void {
1310		- events.settle(backing, pdf.resolve_global, pdf.opened_payload) catch {};
	1342	+ events.settle(backing, pdf.resolve_global, pdf.opened_payload) catch |err| undelivered("pdfOpened", err);
1311	1343	}
1312	1344
1313	1345	fn nativePdfError(env: jni.JNIEnv, _: jni.jobject, message: jni.jstring) callconv(.c) void {
		⋯1 lineShow the 1 line above this hunk@@ -1315,9 +1347,9 @@ fn nativePdfError(env: jni.JNIEnv, _: jni.jobject, message: jni.jstring) callcon
1315	1347	var arena = std.heap.ArenaAllocator.init(backing);
1316	1348	defer arena.deinit();
1317	1349	const allocator = arena.allocator();
1318		- const text = j.stringToUtf8(allocator, message) catch return;
1319		- const payload = pdf.errorPayload(allocator, text) catch return;
1320		- events.settle(allocator, pdf.reject_global, payload) catch {};
	1350	+ const text = j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("pdfError", err);
	1351	+ const payload = pdf.errorPayload(allocator, text) catch |err| return failedWithoutFallback("pdfError", err);
	1352	+ events.settle(allocator, pdf.reject_global, payload) catch |err| undelivered("pdfError", err);
1321	1353	}
1322	1354
1323	1355	fn nativeOpenPDF(
		⋯4 linesShow the 4 lines above this hunk@@ -1328,12 +1360,12 @@ fn nativeOpenPDF(
1328	1360	_: jni.jint,
1329	1361	) callconv(.c) jni.jboolean {
1330	1362	const j = Jni.init(env);
1331		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1363	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("openPDF", err, jni.JNI_FALSE);
1332	1364	j.callStaticVoidMethodA(
1333	1365	holder,
1334		- j.staticMethodId(holder, "openPdfExternal", "(Landroid/app/Activity;Ljava/lang/String;)V") catch return jni.JNI_FALSE,
	1366	+ j.staticMethodId(holder, "openPdfExternal", "(Landroid/app/Activity;Ljava/lang/String;)V") catch |err| return fellThrough("openPDF", err, jni.JNI_FALSE),
1335	1367	&.{ .{ .l = activity }, .{ .l = source } },
1336		- ) catch return jni.JNI_FALSE;
	1368	+ ) catch |err| return fellThrough("openPDF", err, jni.JNI_FALSE);
1337	1369	return jni.JNI_TRUE;
1338	1370	}
1339	1371
		⋯1 lineShow the 1 line above this hunk@@ -1341,7 +1373,7 @@ fn nativeBiometricSucceeded(
1341	1373	_: jni.JNIEnv,
1342	1374	_: jni.jobject,
1343	1375	) callconv(.c) void {
1344		- events.settle(backing, biometric.resolve_global, "true") catch {};
	1376	+ events.settle(backing, biometric.resolve_global, "true") catch |err| undelivered("biometricSucceeded", err);
1345	1377	}
1346	1378
1347	1379	fn nativeBiometricError(
		⋯6 linesShow the 6 lines above this hunk@@ -1354,9 +1386,9 @@ fn nativeBiometricError(
1354	1386	defer arena.deinit();
1355	1387	const allocator = arena.allocator();
1356	1388
1357		- const text = j.stringToUtf8(allocator, message) catch return;
1358		- const payload = biometric.rejectionPayload(allocator, text) catch return;
1359		- events.settle(allocator, biometric.reject_global, payload) catch {};
	1389	+ const text = j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("biometricError", err);
	1390	+ const payload = biometric.rejectionPayload(allocator, text) catch |err| return failedWithoutFallback("biometricError", err);
	1391	+ events.settle(allocator, biometric.reject_global, payload) catch |err| undelivered("biometricError", err);
1360	1392	}
1361	1393
1362	1394	fn nativeAuthenticate(
		⋯11 linesShow the 11 lines above this hunk@@ -1374,18 +1406,18 @@ fn nativeAuthenticate(
1374	1406	const allocator = arena.allocator();
1375	1407	const payload = biometric.rejectionPayload(allocator, biometric.unsupported_activity) catch
1376	1408	return jni.JNI_FALSE;
1377		- events.settle(allocator, biometric.reject_global, payload) catch return jni.JNI_FALSE;
	1409	+ events.settle(allocator, biometric.reject_global, payload) catch |err| return fellThrough("authenticate", err, jni.JNI_FALSE);
1378	1410	return jni.JNI_TRUE;
1379	1411	}
1380	1412
1381		- const holder = j.findClass(holder_class) catch return jni.JNI_FALSE;
	1413	+ const holder = j.findClass(holder_class) catch |err| return fellThrough("authenticate", err, jni.JNI_FALSE);
1382	1414	j.callStaticVoidMethodA(
1383	1415	holder,
1384	1416	j.staticMethodId(
1385	1417	holder,
1386	1418	"showBiometricPrompt",
1387	1419	"(Landroid/app/Activity;Ljava/lang/String;)V",
1388		- ) catch return jni.JNI_FALSE,
	1420	+ ) catch |err| return fellThrough("authenticate", err, jni.JNI_FALSE),
1389	1421	&.{ .{ .l = activity }, .{ .l = reason } },
1390	1422	) catch |err| {
1391	1423	std.log.warn("craft: authenticate fell through to the shim ({s})", .{@errorName(err)});
		⋯13 linesShow the 13 lines above this hunk@@ -1405,8 +1437,8 @@ fn nativeGetNetworkStatus(env: jni.JNIEnv, _: jni.jobject, activity: jni.jobject
1405	1437	return null;
1406	1438	};
1407	1439
1408		- const json = network.render(allocator, status) catch return null;
1409		- return j.newStringUtf8(allocator, json) catch null;
	1440	+ const json = network.render(allocator, status) catch |err| return fellThrough("getNetworkStatus", err, @as(jni.jstring, null));
	1441	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("getNetworkStatus", err, @as(jni.jstring, null));
1410	1442	}
1411	1443
1412	1444	fn nativeSecureSet(
		⋯8 linesShow the 8 lines above this hunk@@ -1421,8 +1453,8 @@ fn nativeSecureSet(
1421	1453	defer arena.deinit();
1422	1454	const allocator = arena.allocator();
1423	1455
1424		- const k = ownedUtf8(j, allocator, key) orelse return jni.JNI_FALSE;
1425		- const v = ownedUtf8(j, allocator, value) orelse return jni.JNI_FALSE;
	1456	+ const k = j.stringToUtf8(allocator, key) catch |err| return fellThrough("secureSet", err, jni.JNI_FALSE);
	1457	+ const v = j.stringToUtf8(allocator, value) catch |err| return fellThrough("secureSet", err, jni.JNI_FALSE);
1426	1458
1427	1459	securestore.set(j, allocator, prefs, k, v) catch |err| {
1428	1460	std.log.warn("craft: secureSet fell through to the shim ({s})", .{@errorName(err)});
		⋯18 linesShow the 18 lines above this hunk@@ -1447,14 +1479,14 @@ fn nativeSecureGet(
1447	1479	defer arena.deinit();
1448	1480	const allocator = arena.allocator();
1449	1481
1450		- const k = ownedUtf8(j, allocator, key) orelse return null;
	1482	+ const k = j.stringToUtf8(allocator, key) catch |err| return fellThrough("secureGet", err, @as(jni.jstring, null));
1451	1483	const value = securestore.get(allocator, j, prefs, k) catch |err| {
1452	1484	std.log.warn("craft: secureGet fell through to the shim ({s})", .{@errorName(err)});
1453	1485	return null;
1454	1486	};
1455	1487
1456		- const json = securestore.renderRead(allocator, value) catch return null;
1457		- return j.newStringUtf8(allocator, json) catch null;
	1488	+ const json = securestore.renderRead(allocator, value) catch |err| return fellThrough("secureGet", err, @as(jni.jstring, null));
	1489	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("secureGet", err, @as(jni.jstring, null));
1458	1490	}
1459	1491
1460	1492	fn nativeSecureRemove(
		⋯8 linesShow the 8 lines above this hunk@@ -1469,7 +1501,7 @@ fn nativeSecureRemove(
1469	1501
1470	1502	const allocator = arena.allocator();
1471	1503
1472		- const k = ownedUtf8(j, allocator, key) orelse return jni.JNI_FALSE;
	1504	+ const k = j.stringToUtf8(allocator, key) catch |err| return fellThrough("secureRemove", err, jni.JNI_FALSE);
1473	1505	securestore.remove(j, allocator, prefs, k) catch |err| {
1474	1506	std.log.warn("craft: secureRemove fell through to the shim ({s})", .{@errorName(err)});
1475	1507	return jni.JNI_FALSE;
		⋯20 linesShow the 20 lines above this hunk@@ -1496,7 +1528,7 @@ fn nativeHaptic(
1496	1528	var arena = std.heap.ArenaAllocator.init(backing);
1497	1529	defer arena.deinit();
1498	1530
1499		- const text = j.stringToUtf8(arena.allocator(), style) catch return jni.JNI_FALSE;
	1531	+ const text = j.stringToUtf8(arena.allocator(), style) catch |err| return fellThrough("haptic", err, jni.JNI_FALSE);
1500	1532	haptics.play(j, activity, haptics.effectForStyle(text)) catch |err| {
1501	1533	std.log.warn("craft: haptic fell through to the shim ({s})", .{@errorName(err)});
1502	1534	return jni.JNI_FALSE;
		⋯12 linesShow the 12 lines above this hunk@@ -1515,12 +1547,12 @@ fn nativeVibrate(
1515	1547	defer arena.deinit();
1516	1548	const allocator = arena.allocator();
1517	1549
1518		- const json = j.stringToUtf8(allocator, pattern_json) catch return jni.JNI_FALSE;
	1550	+ const json = j.stringToUtf8(allocator, pattern_json) catch |err| return fellThrough("vibrate", err, jni.JNI_FALSE);
1519	1551
1520	1552	// Null is a pattern the shim would throw on. Declining lets it throw, log
1521	1553	// "Vibration error", and vibrate nothing — the same outcome with the log
1522	1554	// kept. See bridge_android_haptics.parsePattern.
1523		- const timings = haptics.parsePattern(allocator, json) catch return jni.JNI_FALSE;
	1555	+ const timings = haptics.parsePattern(allocator, json) catch |err| return fellThrough("vibrate", err, jni.JNI_FALSE);
1524	1556	if (timings == null) return jni.JNI_FALSE;
1525	1557
1526	1558	haptics.play(j, activity, .{ .waveform = timings.? }) catch |err| {
		⋯46 linesShow the 46 lines above this hunk@@ -1573,7 +1605,7 @@ fn nativeDeleteCalendarEvent(
1573	1605	defer arena.deinit();
1574	1606	const allocator = arena.allocator();
1575	1607
1576		- const text = j.stringToUtf8(allocator, event_id) catch return jni.JNI_FALSE;
	1608	+ const text = j.stringToUtf8(allocator, event_id) catch |err| return fellThrough("deleteCalendarEvent", err, jni.JNI_FALSE);
1577	1609
1578	1610	const id = calendar.parseEventId(text) orelse {
1579	1611	// What the shim's NumberFormatException produces, with the message it
		⋯1 lineShow the 1 line above this hunk@@ -1581,11 +1613,11 @@ fn nativeDeleteCalendarEvent(
1581	1613	// of hanging the promise. See #154.
1582	1614	var message: std.ArrayListUnmanaged(u8) = .empty;
1583	1615	defer message.deinit(allocator);
1584		- message.appendSlice(allocator, "For input string: \"") catch return jni.JNI_FALSE;
1585		- message.appendSlice(allocator, text) catch return jni.JNI_FALSE;
1586		- message.append(allocator, '"') catch return jni.JNI_FALSE;
	1616	+ message.appendSlice(allocator, "For input string: \"") catch |err| return fellThrough("deleteCalendarEvent", err, jni.JNI_FALSE);
	1617	+ message.appendSlice(allocator, text) catch |err| return fellThrough("deleteCalendarEvent", err, jni.JNI_FALSE);
	1618	+ message.append(allocator, '"') catch |err| return fellThrough("deleteCalendarEvent", err, jni.JNI_FALSE);
1587	1619
1588		- calendar.rejectWith(allocator, message.items) catch return jni.JNI_FALSE;
	1620	+ calendar.rejectWith(allocator, message.items) catch |err| return fellThrough("deleteCalendarEvent", err, jni.JNI_FALSE);
1589	1621	return jni.JNI_TRUE;
1590	1622	};
1591	1623
		⋯2 linesShow the 2 lines above this hunk@@ -1594,11 +1626,11 @@ fn nativeDeleteCalendarEvent(
1594	1626	// here, as it lands in the shim's catch. The error name rather than
1595	1627	// the Java message: the throwable was already described to logcat and
1596	1628	// cleared by `Jni.check`, so its text is gone by now.
1597		- calendar.rejectWith(allocator, @errorName(err)) catch {};
	1629	+ calendar.rejectWith(allocator, @errorName(err)) catch |inner| undelivered("deleteCalendarEvent", inner);
1598	1630	return jni.JNI_TRUE;
1599	1631	};
1600	1632
1601		- events.settle(allocator, calendar.resolve_global, "true") catch return jni.JNI_FALSE;
	1633	+ events.settle(allocator, calendar.resolve_global, "true") catch |err| return fellThrough("deleteCalendarEvent", err, jni.JNI_FALSE);
1602	1634	return jni.JNI_TRUE;
1603	1635	}
1604	1636
		⋯39 linesShow the 39 lines above this hunk@@ -1644,7 +1676,7 @@ fn nativeGetCalendarEvents(
1644	1676	std.log.warn("craft: getCalendarEvents fell through to the shim ({s})", .{@errorName(err)});
1645	1677	return jni.JNI_FALSE;
1646	1678	};
1647		- events.settle(allocator, calendar.list_reject_global, "\"Permission denied\"") catch return jni.JNI_FALSE;
	1679	+ events.settle(allocator, calendar.list_reject_global, "\"Permission denied\"") catch |err| return fellThrough("getCalendarEvents", err, jni.JNI_FALSE);
1648	1680	return jni.JNI_TRUE;
1649	1681	}
1650	1682
		⋯10 linesShow the 10 lines above this hunk@@ -1661,7 +1693,7 @@ fn nativeGetCalendarEvents(
1661	1693	return jni.JNI_FALSE;
1662	1694	};
1663	1695
1664		- events.settle(allocator, calendar.list_resolve_global, payload.items) catch return jni.JNI_FALSE;
	1696	+ events.settle(allocator, calendar.list_resolve_global, payload.items) catch |err| return fellThrough("getCalendarEvents", err, jni.JNI_FALSE);
1665	1697	return jni.JNI_TRUE;
1666	1698	}
1667	1699
		⋯25 linesShow the 25 lines above this hunk@@ -1693,11 +1725,11 @@ fn nativeCreateCalendarEvent(
1693	1725	std.log.warn("craft: createCalendarEvent fell through to the shim ({s})", .{@errorName(err)});
1694	1726	return jni.JNI_FALSE;
1695	1727	};
1696		- events.settle(allocator, calendar.create_reject_global, "\"Permission denied\"") catch return jni.JNI_FALSE;
	1728	+ events.settle(allocator, calendar.create_reject_global, "\"Permission denied\"") catch |err| return fellThrough("createCalendarEvent", err, jni.JNI_FALSE);
1697	1729	return jni.JNI_TRUE;
1698	1730	}
1699	1731
1700		- const text = j.stringToUtf8(allocator, event_json) catch return jni.JNI_FALSE;
	1732	+ const text = j.stringToUtf8(allocator, event_json) catch |err| return fellThrough("createCalendarEvent", err, jni.JNI_FALSE);
1701	1733
1702	1734	// `JSONTokener` is lenient where `std.json` is strict — unquoted keys,
1703	1735	// single quotes, a trailing comma. Everything strict JSON accepts it
		⋯2 linesShow the 2 lines above this hunk@@ -1706,8 +1738,8 @@ fn nativeCreateCalendarEvent(
1706	1738	return jni.JNI_FALSE;
1707	1739	defer parsed.deinit();
1708	1740
1709		- const start_default = calendar.currentTimeMillis(j) catch return jni.JNI_FALSE;
1710		- const end_default = calendar.currentTimeMillis(j) catch return jni.JNI_FALSE;
	1741	+ const start_default = calendar.currentTimeMillis(j) catch |err| return fellThrough("createCalendarEvent", err, jni.JNI_FALSE);
	1742	+ const end_default = calendar.currentTimeMillis(j) catch |err| return fellThrough("createCalendarEvent", err, jni.JNI_FALSE);
1711	1743	const event = calendar.parseNewEvent(
1712	1744	parsed.value,
1713	1745	start_default,
		⋯4 linesShow the 4 lines above this hunk@@ -1718,12 +1750,12 @@ fn nativeCreateCalendarEvent(
1718	1750	// The shim catches here and rejects with the exception's message. The
1719	1751	// throwable was described to logcat and cleared by `Jni.check` before
1720	1752	// this point, so the error name is what is left to say.
1721		- calendar.rejectOn(allocator, calendar.create_reject_global, @errorName(err)) catch {};
	1753	+ calendar.rejectOn(allocator, calendar.create_reject_global, @errorName(err)) catch |inner| undelivered("createCalendarEvent", inner);
1722	1754	return jni.JNI_TRUE;
1723	1755	};
1724	1756
1725		- const payload = calendar.jsonString(allocator, id) catch return jni.JNI_FALSE;
1726		- events.settle(allocator, calendar.create_resolve_global, payload) catch return jni.JNI_FALSE;
	1757	+ const payload = calendar.jsonString(allocator, id) catch |err| return fellThrough("createCalendarEvent", err, jni.JNI_FALSE);
	1758	+ events.settle(allocator, calendar.create_resolve_global, payload) catch |err| return fellThrough("createCalendarEvent", err, jni.JNI_FALSE);
1727	1759	return jni.JNI_TRUE;
1728	1760	}
1729	1761
		⋯33 linesShow the 33 lines above this hunk@@ -1763,19 +1795,19 @@ fn nativeDbExecute(
1763	1795	const allocator = arena.allocator();
1764	1796
1765	1797	var parsed: std.json.Parsed(std.json.Value) = undefined;
1766		- const call = (dbCall(j, allocator, sql, params_json, &parsed) catch return jni.JNI_FALSE) orelse
	1798	+ const call = (dbCall(j, allocator, sql, params_json, &parsed) catch |err| return fellThrough("dbExecute", err, jni.JNI_FALSE)) orelse
1767	1799	return jni.JNI_FALSE;
1768	1800
1769	1801	const rows_affected = db.execute(j, allocator, database, call.sql, call.args) catch |err| {
1770	1802	// The shim catches and rejects with the exception's message; the
1771	1803	// throwable was described to logcat and cleared by `Jni.check` before
1772	1804	// this point, so the error name is what is left to say.
1773		- calendar.rejectOn(allocator, db.exec_reject_global, @errorName(err)) catch {};
	1805	+ calendar.rejectOn(allocator, db.exec_reject_global, @errorName(err)) catch |inner| undelivered("dbExecute", inner);
1774	1806	return jni.JNI_TRUE;
1775	1807	};
1776	1808
1777		- const payload = db.renderExecResult(allocator, rows_affected) catch return jni.JNI_FALSE;
1778		- events.settle(allocator, db.exec_resolve_global, payload) catch return jni.JNI_FALSE;
	1809	+ const payload = db.renderExecResult(allocator, rows_affected) catch |err| return fellThrough("dbExecute", err, jni.JNI_FALSE);
	1810	+ events.settle(allocator, db.exec_resolve_global, payload) catch |err| return fellThrough("dbExecute", err, jni.JNI_FALSE);
1779	1811	return jni.JNI_TRUE;
1780	1812	}
1781	1813
		⋯11 linesShow the 11 lines above this hunk@@ -1793,17 +1825,17 @@ fn nativeDbQuery(
1793	1825	const allocator = arena.allocator();
1794	1826
1795	1827	var parsed: std.json.Parsed(std.json.Value) = undefined;
1796		- const call = (dbCall(j, allocator, sql, params_json, &parsed) catch return jni.JNI_FALSE) orelse
	1828	+ const call = (dbCall(j, allocator, sql, params_json, &parsed) catch |err| return fellThrough("dbQuery", err, jni.JNI_FALSE)) orelse
1797	1829	return jni.JNI_FALSE;
1798	1830
1799	1831	var payload: std.ArrayListUnmanaged(u8) = .empty;
1800	1832	defer payload.deinit(allocator);
1801	1833	db.query(j, allocator, database, call.sql, call.args, &payload) catch |err| {
1802		- calendar.rejectOn(allocator, db.query_reject_global, @errorName(err)) catch {};
	1834	+ calendar.rejectOn(allocator, db.query_reject_global, @errorName(err)) catch |inner| undelivered("dbQuery", inner);
1803	1835	return jni.JNI_TRUE;
1804	1836	};
1805	1837
1806		- events.settle(allocator, db.query_resolve_global, payload.items) catch return jni.JNI_FALSE;
	1838	+ events.settle(allocator, db.query_resolve_global, payload.items) catch |err| return fellThrough("dbQuery", err, jni.JNI_FALSE);
1807	1839	return jni.JNI_TRUE;
1808	1840	}
1809	1841
		⋯11 linesShow the 11 lines above this hunk@@ -1821,17 +1853,17 @@ fn nativeSetSharedItem(
1821	1853	defer arena.deinit();
1822	1854	const allocator = arena.allocator();
1823	1855
1824		- const key_text = j.stringToUtf8(allocator, key) catch return jni.JNI_FALSE;
1825		- const value_text = j.stringToUtf8(allocator, value) catch return jni.JNI_FALSE;
1826		- const group_text = j.stringToUtf8(allocator, group) catch return jni.JNI_FALSE;
	1856	+ const key_text = j.stringToUtf8(allocator, key) catch |err| return fellThrough("setSharedItem", err, jni.JNI_FALSE);
	1857	+ const value_text = j.stringToUtf8(allocator, value) catch |err| return fellThrough("setSharedItem", err, jni.JNI_FALSE);
	1858	+ const group_text = j.stringToUtf8(allocator, group) catch |err| return fellThrough("setSharedItem", err, jni.JNI_FALSE);
1827	1859
1828	1860	shareditem.set(j, allocator, activity, group_text, key_text, value_text) catch |err| {
1829		- calendar.rejectOn(allocator, shareditem.reject_global, @errorName(err)) catch {};
	1861	+ calendar.rejectOn(allocator, shareditem.reject_global, @errorName(err)) catch |inner| undelivered("setSharedItem", inner);
1830	1862	return jni.JNI_TRUE;
1831	1863	};
1832	1864
1833		- const payload = shareditem.mutationPayload(allocator, .set, key_text) catch return jni.JNI_FALSE;
1834		- events.settle(allocator, shareditem.resolve_global, payload) catch return jni.JNI_FALSE;
	1865	+ const payload = shareditem.mutationPayload(allocator, .set, key_text) catch |err| return fellThrough("setSharedItem", err, jni.JNI_FALSE);
	1866	+ events.settle(allocator, shareditem.resolve_global, payload) catch |err| return fellThrough("setSharedItem", err, jni.JNI_FALSE);
1835	1867	return jni.JNI_TRUE;
1836	1868	}
1837	1869
		⋯14 linesShow the 14 lines above this hunk@@ -1852,16 +1884,16 @@ fn nativeGetSharedItem(
1852	1884	defer arena.deinit();
1853	1885	const allocator = arena.allocator();
1854	1886
1855		- const key_text = j.stringToUtf8(allocator, key) catch return jni.JNI_FALSE;
1856		- const group_text = j.stringToUtf8(allocator, group) catch return jni.JNI_FALSE;
	1887	+ const key_text = j.stringToUtf8(allocator, key) catch |err| return fellThrough("getSharedItem", err, jni.JNI_FALSE);
	1888	+ const group_text = j.stringToUtf8(allocator, group) catch |err| return fellThrough("getSharedItem", err, jni.JNI_FALSE);
1857	1889
1858	1890	const value = shareditem.get(j, allocator, activity, group_text, key_text) catch |err| {
1859		- calendar.rejectOn(allocator, shareditem.reject_global, @errorName(err)) catch {};
	1891	+ calendar.rejectOn(allocator, shareditem.reject_global, @errorName(err)) catch |inner| undelivered("getSharedItem", inner);
1860	1892	return jni.JNI_TRUE;
1861	1893	};
1862	1894
1863		- const payload = shareditem.valuePayload(allocator, key_text, value) catch return jni.JNI_FALSE;
1864		- events.settle(allocator, shareditem.resolve_global, payload) catch return jni.JNI_FALSE;
	1895	+ const payload = shareditem.valuePayload(allocator, key_text, value) catch |err| return fellThrough("getSharedItem", err, jni.JNI_FALSE);
	1896	+ events.settle(allocator, shareditem.resolve_global, payload) catch |err| return fellThrough("getSharedItem", err, jni.JNI_FALSE);
1865	1897	return jni.JNI_TRUE;
1866	1898	}
1867	1899
		⋯10 linesShow the 10 lines above this hunk@@ -1878,16 +1910,16 @@ fn nativeRemoveSharedItem(
1878	1910	defer arena.deinit();
1879	1911	const allocator = arena.allocator();
1880	1912
1881		- const key_text = j.stringToUtf8(allocator, key) catch return jni.JNI_FALSE;
1882		- const group_text = j.stringToUtf8(allocator, group) catch return jni.JNI_FALSE;
	1913	+ const key_text = j.stringToUtf8(allocator, key) catch |err| return fellThrough("removeSharedItem", err, jni.JNI_FALSE);
	1914	+ const group_text = j.stringToUtf8(allocator, group) catch |err| return fellThrough("removeSharedItem", err, jni.JNI_FALSE);
1883	1915
1884	1916	shareditem.remove(j, allocator, activity, group_text, key_text) catch |err| {
1885		- calendar.rejectOn(allocator, shareditem.reject_global, @errorName(err)) catch {};
	1917	+ calendar.rejectOn(allocator, shareditem.reject_global, @errorName(err)) catch |inner| undelivered("removeSharedItem", inner);
1886	1918	return jni.JNI_TRUE;
1887	1919	};
1888	1920
1889		- const payload = shareditem.mutationPayload(allocator, .remove, key_text) catch return jni.JNI_FALSE;
1890		- events.settle(allocator, shareditem.resolve_global, payload) catch return jni.JNI_FALSE;
	1921	+ const payload = shareditem.mutationPayload(allocator, .remove, key_text) catch |err| return fellThrough("removeSharedItem", err, jni.JNI_FALSE);
	1922	+ events.settle(allocator, shareditem.resolve_global, payload) catch |err| return fellThrough("removeSharedItem", err, jni.JNI_FALSE);
1891	1923	return jni.JNI_TRUE;
1892	1924	}
1893	1925
		⋯22 linesShow the 22 lines above this hunk@@ -1916,7 +1948,7 @@ fn nativeGetContacts(
1916	1948	std.log.warn("craft: getContacts fell through to the shim ({s})", .{@errorName(err)});
1917	1949	return jni.JNI_FALSE;
1918	1950	};
1919		- events.settle(allocator, contacts.reject_global, "\"Permission denied\"") catch return jni.JNI_FALSE;
	1951	+ events.settle(allocator, contacts.reject_global, "\"Permission denied\"") catch |err| return fellThrough("getContacts", err, jni.JNI_FALSE);
1920	1952	return jni.JNI_TRUE;
1921	1953	}
1922	1954
		⋯4 linesShow the 4 lines above this hunk@@ -1927,7 +1959,7 @@ fn nativeGetContacts(
1927	1959	return jni.JNI_FALSE;
1928	1960	};
1929	1961
1930		- events.settle(allocator, contacts.resolve_global, payload.items) catch return jni.JNI_FALSE;
	1962	+ events.settle(allocator, contacts.resolve_global, payload.items) catch |err| return fellThrough("getContacts", err, jni.JNI_FALSE);
1931	1963	return jni.JNI_TRUE;
1932	1964	}
1933	1965
		⋯23 linesShow the 23 lines above this hunk@@ -1957,11 +1989,11 @@ fn nativeAddContact(
1957	1989	std.log.warn("craft: addContact fell through to the shim ({s})", .{@errorName(err)});
1958	1990	return jni.JNI_FALSE;
1959	1991	};
1960		- events.settle(allocator, contacts.add_reject_global, "\"Permission denied\"") catch return jni.JNI_FALSE;
	1992	+ events.settle(allocator, contacts.add_reject_global, "\"Permission denied\"") catch |err| return fellThrough("addContact", err, jni.JNI_FALSE);
1961	1993	return jni.JNI_TRUE;
1962	1994	}
1963	1995
1964		- const text = j.stringToUtf8(allocator, contact_json) catch return jni.JNI_FALSE;
	1996	+ const text = j.stringToUtf8(allocator, contact_json) catch |err| return fellThrough("addContact", err, jni.JNI_FALSE);
1965	1997	var parsed = std.json.parseFromSlice(std.json.Value, allocator, text, .{}) catch
1966	1998	return jni.JNI_FALSE;
1967	1999	defer parsed.deinit();
		⋯1 lineShow the 1 line above this hunk@@ -1969,14 +2001,14 @@ fn nativeAddContact(
1969	2001	const contact = contacts.parseNewContact(parsed.value) orelse return jni.JNI_FALSE;
1970	2002
1971	2003	const id = contacts.addContact(j, allocator, activity, contact) catch |err| {
1972		- calendar.rejectOn(allocator, contacts.add_reject_global, @errorName(err)) catch {};
	2004	+ calendar.rejectOn(allocator, contacts.add_reject_global, @errorName(err)) catch |inner| undelivered("addContact", inner);
1973	2005	return jni.JNI_TRUE;
1974	2006	};
1975	2007
1976	2008	var buf: [24]u8 = undefined;
1977		- const digits = std.fmt.bufPrint(&buf, "{d}", .{id}) catch return jni.JNI_FALSE;
1978		- const payload = calendar.jsonString(allocator, digits) catch return jni.JNI_FALSE;
1979		- events.settle(allocator, contacts.add_resolve_global, payload) catch return jni.JNI_FALSE;
	2009	+ const digits = std.fmt.bufPrint(&buf, "{d}", .{id}) catch |err| return fellThrough("addContact", err, jni.JNI_FALSE);
	2010	+ const payload = calendar.jsonString(allocator, digits) catch |err| return fellThrough("addContact", err, jni.JNI_FALSE);
	2011	+ events.settle(allocator, contacts.add_resolve_global, payload) catch |err| return fellThrough("addContact", err, jni.JNI_FALSE);
1980	2012	return jni.JNI_TRUE;
1981	2013	}
1982	2014
		⋯26 linesShow the 26 lines above this hunk@@ -2009,20 +2041,20 @@ fn nativeUpdateWidget(
2009	2041	defer arena.deinit();
2010	2042	const allocator = arena.allocator();
2011	2043
2012		- const text = j.stringToUtf8(allocator, data_json) catch return jni.JNI_FALSE;
	2044	+ const text = j.stringToUtf8(allocator, data_json) catch |err| return fellThrough("updateWidget", err, jni.JNI_FALSE);
2013	2045	var parsed = std.json.parseFromSlice(std.json.Value, allocator, text, .{}) catch
2014	2046	return jni.JNI_FALSE;
2015	2047	defer parsed.deinit();
2016	2048
2017	2049	const update = widgets.parseUpdate(parsed.value) orelse return jni.JNI_FALSE;
2018		- const action_text = j.stringToUtf8(allocator, action) catch return jni.JNI_FALSE;
	2050	+ const action_text = j.stringToUtf8(allocator, action) catch |err| return fellThrough("updateWidget", err, jni.JNI_FALSE);
2019	2051
2020	2052	widgets.writeUpdate(j, allocator, activity, update) catch |err| {
2021		- calendar.rejectOn(allocator, widgets.reject_global, @errorName(err)) catch {};
	2053	+ calendar.rejectOn(allocator, widgets.reject_global, @errorName(err)) catch |inner| undelivered("updateWidget", inner);
2022	2054	return jni.JNI_TRUE;
2023	2055	};
2024	2056	widgets.broadcast(j, allocator, activity, action_text) catch |err| {
2025		- calendar.rejectOn(allocator, widgets.reject_global, @errorName(err)) catch {};
	2057	+ calendar.rejectOn(allocator, widgets.reject_global, @errorName(err)) catch |inner| undelivered("updateWidget", inner);
2026	2058	return jni.JNI_TRUE;
2027	2059	};
2028	2060
		⋯18 linesShow the 18 lines above this hunk@@ -2047,10 +2079,10 @@ fn nativeReloadWidgets(
2047	2079	defer arena.deinit();
2048	2080	const allocator = arena.allocator();
2049	2081
2050		- const action_text = j.stringToUtf8(allocator, action) catch return jni.JNI_FALSE;
	2082	+ const action_text = j.stringToUtf8(allocator, action) catch |err| return fellThrough("reloadWidgets", err, jni.JNI_FALSE);
2051	2083
2052	2084	widgets.broadcast(j, allocator, activity, action_text) catch |err| {
2053		- calendar.rejectOn(allocator, widgets.reject_global, @errorName(err)) catch {};
	2085	+ calendar.rejectOn(allocator, widgets.reject_global, @errorName(err)) catch |inner| undelivered("reloadWidgets", inner);
2054	2086	return jni.JNI_TRUE;
2055	2087	};
2056	2088
		⋯22 linesShow the 22 lines above this hunk@@ -2079,11 +2111,11 @@ fn nativeSetShortcuts(
2079	2111	if (sdk < shortcuts.n_mr1) {
2080	2112	const payload = shortcuts.jsonString(allocator, shortcuts.unsupported_message) catch
2081	2113	return jni.JNI_FALSE;
2082		- events.settle(allocator, shortcuts.reject_global, payload) catch return jni.JNI_FALSE;
	2114	+ events.settle(allocator, shortcuts.reject_global, payload) catch |err| return fellThrough("setShortcuts", err, jni.JNI_FALSE);
2083	2115	return jni.JNI_TRUE;
2084	2116	}
2085	2117
2086		- const text = j.stringToUtf8(allocator, shortcuts_json) catch return jni.JNI_FALSE;
	2118	+ const text = j.stringToUtf8(allocator, shortcuts_json) catch |err| return fellThrough("setShortcuts", err, jni.JNI_FALSE);
2087	2119	var parsed = std.json.parseFromSlice(std.json.Value, allocator, text, .{}) catch
2088	2120	return jni.JNI_FALSE;
2089	2121	defer parsed.deinit();
		⋯4 linesShow the 4 lines above this hunk@@ -2094,19 +2126,19 @@ fn nativeSetShortcuts(
2094	2126	const list = shortcuts.parseShortcuts(allocator, parsed.value) catch |err| {
2095	2127	const payload = shortcuts.jsonString(allocator, @errorName(err)) catch
2096	2128	return jni.JNI_FALSE;
2097		- events.settle(allocator, shortcuts.reject_global, payload) catch return jni.JNI_FALSE;
	2129	+ events.settle(allocator, shortcuts.reject_global, payload) catch |inner| return fellThrough("setShortcuts", inner, jni.JNI_FALSE);
2098	2130	return jni.JNI_TRUE;
2099	2131	} orelse return jni.JNI_FALSE;
2100	2132
2101	2133	shortcuts.set(j, allocator, activity, list) catch |err| {
2102	2134	const payload = shortcuts.jsonString(allocator, @errorName(err)) catch
2103	2135	return jni.JNI_FALSE;
2104		- events.settle(allocator, shortcuts.reject_global, payload) catch return jni.JNI_FALSE;
	2136	+ events.settle(allocator, shortcuts.reject_global, payload) catch |inner| return fellThrough("setShortcuts", inner, jni.JNI_FALSE);
2105	2137	return jni.JNI_TRUE;
2106	2138	};
2107	2139
2108		- const payload = shortcuts.setPayload(allocator, list.len) catch return jni.JNI_FALSE;
2109		- events.settle(allocator, shortcuts.resolve_global, payload) catch return jni.JNI_FALSE;
	2140	+ const payload = shortcuts.setPayload(allocator, list.len) catch |err| return fellThrough("setShortcuts", err, jni.JNI_FALSE);
	2141	+ events.settle(allocator, shortcuts.resolve_global, payload) catch |err| return fellThrough("setShortcuts", err, jni.JNI_FALSE);
2110	2142	return jni.JNI_TRUE;
2111	2143	}
2112	2144
		⋯20 linesShow the 20 lines above this hunk@@ -2133,12 +2165,12 @@ fn nativeClearShortcuts(
2133	2165	shortcuts.clear(j, activity) catch |err| {
2134	2166	const payload = shortcuts.jsonString(allocator, @errorName(err)) catch
2135	2167	return jni.JNI_FALSE;
2136		- events.settle(allocator, shortcuts.reject_global, payload) catch return jni.JNI_FALSE;
	2168	+ events.settle(allocator, shortcuts.reject_global, payload) catch |inner| return fellThrough("clearShortcuts", inner, jni.JNI_FALSE);
2137	2169	return jni.JNI_TRUE;
2138	2170	};
2139	2171	}
2140	2172
2141		- events.settle(allocator, shortcuts.resolve_global, shortcuts.cleared_result) catch return jni.JNI_FALSE;
	2173	+ events.settle(allocator, shortcuts.resolve_global, shortcuts.cleared_result) catch |err| return fellThrough("clearShortcuts", err, jni.JNI_FALSE);
2142	2174	return jni.JNI_TRUE;
2143	2175	}
2144	2176
		⋯15 linesShow the 15 lines above this hunk@@ -2160,7 +2192,7 @@ fn nativeScheduleNotification(
2160	2192	defer arena.deinit();
2161	2193	const allocator = arena.allocator();
2162	2194
2163		- const text = j.stringToUtf8(allocator, notification_json) catch return jni.JNI_FALSE;
	2195	+ const text = j.stringToUtf8(allocator, notification_json) catch |err| return fellThrough("scheduleNotification", err, jni.JNI_FALSE);
2164	2196
2165	2197	// `JSONObject(notificationJson)` throwing is the shim's first catch, so a
2166	2198	// payload this cannot parse goes back rather than being rejected here.
		⋯1 lineShow the 1 line above this hunk@@ -2168,25 +2200,25 @@ fn nativeScheduleNotification(
2168	2200	return jni.JNI_FALSE;
2169	2201	defer parsed.deinit();
2170	2202
2171		- const default_id = notifications.defaultId(j, allocator) catch return jni.JNI_FALSE;
	2203	+ const default_id = notifications.defaultId(j, allocator) catch |err| return fellThrough("scheduleNotification", err, jni.JNI_FALSE);
2172	2204	const notification = notifications.parseNotification(parsed.value, default_id) orelse
2173	2205	return jni.JNI_FALSE;
2174	2206
2175	2207	if (!notifications.servesImmediately(notification)) return jni.JNI_FALSE;
2176	2208
2177	2209	notifications.ensureChannel(j, activity) catch |err| {
2178		- calendar.rejectOn(allocator, notifications.schedule_reject_global, @errorName(err)) catch {};
	2210	+ calendar.rejectOn(allocator, notifications.schedule_reject_global, @errorName(err)) catch |inner| undelivered("scheduleNotification", inner);
2179	2211	return jni.JNI_TRUE;
2180	2212	};
2181	2213
2182	2214	_ = notifications.post(j, allocator, activity, notification) catch |err| {
2183		- calendar.rejectOn(allocator, notifications.schedule_reject_global, @errorName(err)) catch {};
	2215	+ calendar.rejectOn(allocator, notifications.schedule_reject_global, @errorName(err)) catch |inner| undelivered("scheduleNotification", inner);
2184	2216	return jni.JNI_TRUE;
2185	2217	};
2186	2218
2187	2219	// The id, not the hash: the page sent a string and gets the same string
2188	2220	// back, which is what it needs to cancel with later.
2189		- const payload = calendar.jsonString(allocator, notification.id) catch return jni.JNI_FALSE;
	2221	+ const payload = calendar.jsonString(allocator, notification.id) catch |err| return fellThrough("scheduleNotification", err, jni.JNI_FALSE);
2190	2222	events.settle(allocator, notifications.schedule_resolve_global, payload) catch
2191	2223	return jni.JNI_FALSE;
2192	2224	return jni.JNI_TRUE;
		⋯44 linesShow the 44 lines above this hunk@@ -2237,7 +2269,7 @@ fn nativeLockOrientation(
2237	2269	var arena = std.heap.ArenaAllocator.init(backing);
2238	2270	defer arena.deinit();
2239	2271
2240		- const text = j.stringToUtf8(arena.allocator(), name) catch return jni.JNI_FALSE;
	2272	+ const text = j.stringToUtf8(arena.allocator(), name) catch |err| return fellThrough("lockOrientation", err, jni.JNI_FALSE);
2241	2273
2242	2274	screen.apply(j, activity, screen.modeFor(text)) catch |err| {
2243	2275	std.log.warn("craft: lockOrientation fell through to the shim ({s})", .{@errorName(err)});
		⋯54 linesShow the 54 lines above this hunk@@ -2298,18 +2330,18 @@ fn nativeDownloadFile(
2298	2330	defer arena.deinit();
2299	2331	const allocator = arena.allocator();
2300	2332
2301		- const url_text = j.stringToUtf8(allocator, url) catch return jni.JNI_FALSE;
2302		- const name_text = j.stringToUtf8(allocator, filename) catch return jni.JNI_FALSE;
	2333	+ const url_text = j.stringToUtf8(allocator, url) catch |err| return fellThrough("downloadFile", err, jni.JNI_FALSE);
	2334	+ const name_text = j.stringToUtf8(allocator, filename) catch |err| return fellThrough("downloadFile", err, jni.JNI_FALSE);
2303	2335
2304	2336	const id = files.download(j, allocator, activity, url_text, name_text) catch |err| {
2305		- calendar.rejectOn(allocator, files.download_reject_global, @errorName(err)) catch {};
	2337	+ calendar.rejectOn(allocator, files.download_reject_global, @errorName(err)) catch |inner| undelivered("downloadFile", inner);
2306	2338	return jni.JNI_TRUE;
2307	2339	};
2308	2340
2309	2341	var buf: [24]u8 = undefined;
2310		- const digits = std.fmt.bufPrint(&buf, "{d}", .{id}) catch return jni.JNI_FALSE;
2311		- const payload = files.jsonString(allocator, digits) catch return jni.JNI_FALSE;
2312		- events.settle(allocator, files.download_resolve_global, payload) catch return jni.JNI_FALSE;
	2342	+ const digits = std.fmt.bufPrint(&buf, "{d}", .{id}) catch |err| return fellThrough("downloadFile", err, jni.JNI_FALSE);
	2343	+ const payload = files.jsonString(allocator, digits) catch |err| return fellThrough("downloadFile", err, jni.JNI_FALSE);
	2344	+ events.settle(allocator, files.download_resolve_global, payload) catch |err| return fellThrough("downloadFile", err, jni.JNI_FALSE);
2313	2345	return jni.JNI_TRUE;
2314	2346	}
2315	2347
		⋯10 linesShow the 10 lines above this hunk@@ -2326,20 +2358,20 @@ fn nativeSaveFile(
2326	2358	defer arena.deinit();
2327	2359	const allocator = arena.allocator();
2328	2360
2329		- const data_text = j.stringToUtf8(allocator, data) catch return jni.JNI_FALSE;
2330		- const name_text = j.stringToUtf8(allocator, filename) catch return jni.JNI_FALSE;
	2361	+ const data_text = j.stringToUtf8(allocator, data) catch |err| return fellThrough("saveFile", err, jni.JNI_FALSE);
	2362	+ const name_text = j.stringToUtf8(allocator, filename) catch |err| return fellThrough("saveFile", err, jni.JNI_FALSE);
2331	2363
2332	2364	const plan = files.planFor(data_text) catch {
2333		- calendar.rejectOn(allocator, files.save_reject_global, files.malformed_data_url) catch {};
	2365	+ calendar.rejectOn(allocator, files.save_reject_global, files.malformed_data_url) catch |err| undelivered("saveFile", err);
2334	2366	return jni.JNI_TRUE;
2335	2367	};
2336	2368	const path = files.save(j, allocator, activity, name_text, plan) catch |err| {
2337		- calendar.rejectOn(allocator, files.save_reject_global, @errorName(err)) catch {};
	2369	+ calendar.rejectOn(allocator, files.save_reject_global, @errorName(err)) catch |inner| undelivered("saveFile", inner);
2338	2370	return jni.JNI_TRUE;
2339	2371	};
2340	2372
2341		- const payload = files.jsonString(allocator, path) catch return jni.JNI_FALSE;
2342		- events.settle(allocator, files.save_resolve_global, payload) catch return jni.JNI_FALSE;
	2373	+ const payload = files.jsonString(allocator, path) catch |err| return fellThrough("saveFile", err, jni.JNI_FALSE);
	2374	+ events.settle(allocator, files.save_resolve_global, payload) catch |err| return fellThrough("saveFile", err, jni.JNI_FALSE);
2343	2375	return jni.JNI_TRUE;
2344	2376	}
2345	2377
		⋯18 linesShow the 18 lines above this hunk@@ -2364,7 +2396,7 @@ fn nativeGetLocationRecordingState(
2364	2396
2365	2397	// A line the shim would drop and this cannot parse: hand the whole read
2366	2398	// back rather than disagreeing about how many samples there are.
2367		- const locations = (locationstore.renderLocations(allocator, contents) catch return null) orelse
	2399	+ const locations = (locationstore.renderLocations(allocator, contents) catch |err| return fellThrough("getLocationRecordingState", err, @as(jni.jstring, null))) orelse
2368	2400	return null;
2369	2401
2370	2402	const state = locationstore.readState(j, allocator, activity, locations.count) catch |err| {
		⋯1 lineShow the 1 line above this hunk@@ -2372,8 +2404,8 @@ fn nativeGetLocationRecordingState(
2372	2404	return null;
2373	2405	};
2374	2406
2375		- const json = locationstore.renderState(allocator, state) catch return null;
2376		- return j.newStringUtf8(allocator, json) catch null;
	2407	+ const json = locationstore.renderState(allocator, state) catch |err| return fellThrough("getLocationRecordingState", err, @as(jni.jstring, null));
	2408	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("getLocationRecordingState", err, @as(jni.jstring, null));
2377	2409	}
2378	2410
2379	2411	/// `nativeReadLocationRecording(activity)`.
		⋯12 linesShow the 12 lines above this hunk@@ -2392,9 +2424,9 @@ fn nativeReadLocationRecording(
2392	2424	return null;
2393	2425	};
2394	2426
2395		- const locations = (locationstore.renderLocations(allocator, contents) catch return null) orelse
	2427	+ const locations = (locationstore.renderLocations(allocator, contents) catch |err| return fellThrough("readLocationRecording", err, @as(jni.jstring, null))) orelse
2396	2428	return null;
2397		- return j.newStringUtf8(allocator, locations.json) catch null;
	2429	+ return j.newStringUtf8(allocator, locations.json) catch |err| fellThrough("readLocationRecording", err, @as(jni.jstring, null));
2398	2430	}
2399	2431
2400	2432	/// The current state as a Java String, or null if any part of the read
		⋯4 linesShow the 4 lines above this hunk@@ -2405,17 +2437,17 @@ fn recordingStateString(
2405	2437	activity: jni.jobject,
2406	2438	include_locations: bool,
2407	2439	) jni.jstring {
2408		- const contents = locationstore.readFile(j, allocator, activity) catch return null;
2409		- const locations = (locationstore.renderLocations(allocator, contents) catch return null) orelse
	2440	+ const contents = locationstore.readFile(j, allocator, activity) catch |err| return fellThrough("recordingStateString", err, @as(jni.jstring, null));
	2441	+ const locations = (locationstore.renderLocations(allocator, contents) catch |err| return fellThrough("recordingStateString", err, @as(jni.jstring, null))) orelse
2410	2442	return null;
2411		- const state = locationstore.readState(j, allocator, activity, locations.count) catch return null;
	2443	+ const state = locationstore.readState(j, allocator, activity, locations.count) catch |err| return fellThrough("recordingStateString", err, @as(jni.jstring, null));
2412	2444
2413	2445	const json = locationstore.renderStateWith(
2414	2446	allocator,
2415	2447	state,
2416	2448	if (include_locations) locations.json else null,
2417		- ) catch return null;
2418		- return j.newStringUtf8(allocator, json) catch null;
	2449	+ ) catch |err| return fellThrough("recordingStateString", err, @as(jni.jstring, null));
	2450	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("recordingStateString", err, @as(jni.jstring, null));
2419	2451	}
2420	2452
2421	2453	/// `nativeStartLocationRecording(activity)`.
		⋯14 linesShow the 14 lines above this hunk@@ -2436,16 +2468,16 @@ fn nativeStartLocationRecording(
2436	2468	// A different object from "never recorded": this path builds a fresh
2437	2469	// JSONObject with an explicit JSONObject.NULL id, so the key is
2438	2470	// present and null rather than absent.
2439		- const json = locationstore.renderDenied(allocator) catch return null;
2440		- return j.newStringUtf8(allocator, json) catch null;
	2471	+ const json = locationstore.renderDenied(allocator) catch |err| return fellThrough("startLocationRecording", err, @as(jni.jstring, null));
	2472	+ return j.newStringUtf8(allocator, json) catch |err| fellThrough("startLocationRecording", err, @as(jni.jstring, null));
2441	2473	}
2442	2474
2443		- const id = locationstore.newRecordingId(j, allocator) catch return null;
2444		- const started_at = locationstore.nowMillis(j) catch return null;
2445		- locationstore.startStore(j, allocator, activity, id, started_at) catch return null;
	2475	+ const id = locationstore.newRecordingId(j, allocator) catch |err| return fellThrough("startLocationRecording", err, @as(jni.jstring, null));
	2476	+ const started_at = locationstore.nowMillis(j) catch |err| return fellThrough("startLocationRecording", err, @as(jni.jstring, null));
	2477	+ locationstore.startStore(j, allocator, activity, id, started_at) catch |err| return fellThrough("startLocationRecording", err, @as(jni.jstring, null));
2446	2478
2447	2479	// Kotlin names the service class, because its package is templated.
2448		- startRecordingService(j, activity) catch return null;
	2480	+ startRecordingService(j, activity) catch |err| return fellThrough("startLocationRecording", err, @as(jni.jstring, null));
2449	2481
2450	2482	return recordingStateString(j, allocator, activity, false);
2451	2483	}
		⋯12 linesShow the 12 lines above this hunk@@ -2464,14 +2496,14 @@ fn nativeStopLocationRecording(
2464	2496	defer arena.deinit();
2465	2497	const allocator = arena.allocator();
2466	2498
2467		- locationstore.stopStore(j, allocator, activity) catch return null;
	2499	+ locationstore.stopStore(j, allocator, activity) catch |err| return fellThrough("stopLocationRecording", err, @as(jni.jstring, null));
2468	2500
2469	2501	// Declining after the store write is safe: `stop` is idempotent, so the
2470	2502	// shim runs the whole method again and reaches `stopService` itself.
2471	2503	const result = recordingStateString(j, allocator, activity, true);
2472	2504	if (result == null) return null;
2473	2505
2474		- stopRecordingService(j, activity) catch return null;
	2506	+ stopRecordingService(j, activity) catch |err| return fellThrough("stopLocationRecording", err, @as(jni.jstring, null));
2475	2507	return result;
2476	2508	}
2477	2509
		⋯8 linesShow the 8 lines above this hunk@@ -2486,7 +2518,7 @@ fn nativePauseLocationRecording(
2486	2518	defer arena.deinit();
2487	2519	const allocator = arena.allocator();
2488	2520
2489		- locationstore.setPaused(j, allocator, activity, true) catch return null;
	2521	+ locationstore.setPaused(j, allocator, activity, true) catch |err| return fellThrough("pauseLocationRecording", err, @as(jni.jstring, null));
2490	2522	return recordingStateString(j, allocator, activity, false);
2491	2523	}
2492	2524
		⋯12 linesShow the 12 lines above this hunk@@ -2505,10 +2537,10 @@ fn nativeResumeLocationRecording(
2505	2537	defer arena.deinit();
2506	2538	const allocator = arena.allocator();
2507	2539
2508		- locationstore.setPaused(j, allocator, activity, false) catch return null;
	2540	+ locationstore.setPaused(j, allocator, activity, false) catch |err| return fellThrough("resumeLocationRecording", err, @as(jni.jstring, null));
2509	2541
2510		- const active = locationstore.isActive(j, allocator, activity) catch return null;
2511		- if (active) startRecordingService(j, activity) catch return null;
	2542	+ const active = locationstore.isActive(j, allocator, activity) catch |err| return fellThrough("resumeLocationRecording", err, @as(jni.jstring, null));
	2543	+ if (active) startRecordingService(j, activity) catch |err| return fellThrough("resumeLocationRecording", err, @as(jni.jstring, null));
2512	2544
2513	2545	return recordingStateString(j, allocator, activity, false);
2514	2546	}
		⋯25 linesShow the 25 lines above this hunk@@ -2540,9 +2572,9 @@ fn nativeNetworkChanged(
2540	2572	defer arena.deinit();
2541	2573	const allocator = arena.allocator();
2542	2574
2543		- const status = network.read(j, activity) catch return;
2544		- const json = network.render(allocator, status) catch return;
2545		- events.settle(allocator, network.change_global, json) catch {};
	2575	+ const status = network.read(j, activity) catch |err| return failedWithoutFallback("networkChanged", err);
	2576	+ const json = network.render(allocator, status) catch |err| return failedWithoutFallback("networkChanged", err);
	2577	+ events.settle(allocator, network.change_global, json) catch |err| undelivered("networkChanged", err);
2546	2578	}
2547	2579
2548	2580	/// `nativeStartNetworkMonitoring(activity)`.
		⋯64 linesShow the 64 lines above this hunk@@ -2613,12 +2645,12 @@ fn nativeAppStateEvent(
2613	2645	defer arena.deinit();
2614	2646	const allocator = arena.allocator();
2615	2647
2616		- const name = j.stringToUtf8(allocator, event_name) catch return;
	2648	+ const name = j.stringToUtf8(allocator, event_name) catch |err| return failedWithoutFallback("appStateEvent", err);
2617	2649
2618	2650	// Null covers both "this event carries no state" and "it carries the one
2619	2651	// already held", and the shim announces neither.
2620	2652	const changed = appstate.apply(name) orelse return;
2621		- appstate.announce(allocator, changed) catch {};
	2653	+ appstate.announce(allocator, changed) catch |err| undelivered("appStateEvent", err);
2622	2654	}
2623	2655
2624	2656	/// `nativeStartAppStateMonitoring(activity)`.
		⋯42 linesShow the 42 lines above this hunk@@ -2667,7 +2699,7 @@ fn nativeGetAppState(env: jni.JNIEnv, _: jni.jobject) callconv(.c) jni.jstring {
2667	2699	var arena = std.heap.ArenaAllocator.init(backing);
2668	2700	defer arena.deinit();
2669	2701
2670		- return j.newStringUtf8(arena.allocator(), appstate.state().name()) catch null;
	2702	+ return j.newStringUtf8(arena.allocator(), appstate.state().name()) catch |err| fellThrough("getAppState", err, @as(jni.jstring, null));
2671	2703	}
2672	2704
2673	2705	/// `nativeBluetoothDevice(address, name, rssi)` — one scan result.
		⋯9 linesShow the 9 lines above this hunk@@ -2683,16 +2715,16 @@ fn nativeBluetoothDevice(
2683	2715	defer arena.deinit();
2684	2716	const allocator = arena.allocator();
2685	2717
2686		- const address_text = j.stringToUtf8(allocator, address) catch return;
	2718	+ const address_text = j.stringToUtf8(allocator, address) catch |err| return failedWithoutFallback("bluetoothDevice", err);
2687	2719
2688	2720	// Null is a device advertising no name, which is the common case rather
2689	2721	// than the edge one — `bluetooth.announce` applies the shim's "Unknown".
2690	2722	const name_text: ?[]const u8 = if (name == null)
2691	2723	null
2692	2724	else
2693		- j.stringToUtf8(allocator, name) catch return;
	2725	+ j.stringToUtf8(allocator, name) catch |err| return failedWithoutFallback("bluetoothDevice", err);
2694	2726
2695		- bluetooth.announce(allocator, address_text, name_text, rssi) catch {};
	2727	+ bluetooth.announce(allocator, address_text, name_text, rssi) catch |err| undelivered("bluetoothDevice", err);
2696	2728	}
2697	2729
2698	2730	/// `nativeStartBluetoothScan(activity)`.
		⋯24 linesShow the 24 lines above this hunk@@ -2723,7 +2755,7 @@ fn nativeStartBluetoothScan(
2723	2755	std.log.warn("craft: startBluetoothScan fell through to the shim ({s})", .{@errorName(err)});
2724	2756	return jni.JNI_FALSE;
2725	2757	};
2726		- calendar.rejectOn(allocator, bluetooth.reject_global, "Permission denied") catch {};
	2758	+ calendar.rejectOn(allocator, bluetooth.reject_global, "Permission denied") catch |err| undelivered("startBluetoothScan", err);
2727	2759	return jni.JNI_TRUE;
2728	2760	}
2729	2761
		⋯3 linesShow the 3 lines above this hunk@@ -2733,11 +2765,11 @@ fn nativeStartBluetoothScan(
2733	2765	};
2734	2766
2735	2767	if (bluetooth.startError(start_status)) |message| {
2736		- calendar.rejectOn(allocator, bluetooth.reject_global, message) catch return jni.JNI_FALSE;
	2768	+ calendar.rejectOn(allocator, bluetooth.reject_global, message) catch |err| return fellThrough("startBluetoothScan", err, jni.JNI_FALSE);
2737	2769	return jni.JNI_TRUE;
2738	2770	}
2739	2771
2740		- events.settle(allocator, bluetooth.resolve_global, "true") catch return jni.JNI_FALSE;
	2772	+ events.settle(allocator, bluetooth.resolve_global, "true") catch |err| return fellThrough("startBluetoothScan", err, jni.JNI_FALSE);
2741	2773	return jni.JNI_TRUE;
2742	2774	}
2743	2775
		⋯43 linesShow the 43 lines above this hunk@@ -2787,15 +2819,15 @@ fn nativeMotionSample(
2787	2819	// `Float.toString` is not a format string — see `android_json_number`.
2788	2820	var printed: [6][]const u8 = undefined;
2789	2821	inline for (0..3) |i| {
2790		- printed[i] = json_number.fromFloat(j, allocator, acceleration[i]) catch return;
2791		- printed[i + 3] = json_number.fromFloat(j, allocator, rotation[i]) catch return;
	2822	+ printed[i] = json_number.fromFloat(j, allocator, acceleration[i]) catch |err| return failedWithoutFallback("motionSample", err);
	2823	+ printed[i + 3] = json_number.fromFloat(j, allocator, rotation[i]) catch |err| return failedWithoutFallback("motionSample", err);
2792	2824	}
2793	2825
2794	2826	motion.announce(
2795	2827	allocator,
2796	2828	.{ printed[0], printed[1], printed[2] },
2797	2829	.{ printed[3], printed[4], printed[5] },
2798		- ) catch {};
	2830	+ ) catch |err| undelivered("motionSample", err);
2799	2831	}
2800	2832
2801	2833	/// `nativeStartMotionUpdates(activity, intervalMs)`.
		⋯98 linesShow the 98 lines above this hunk@@ -2900,20 +2932,20 @@ fn nativeLocationResult(
2900	2932
2901	2933	var timestamp: [24]u8 = undefined;
2902	2934	const printed: position.Printed = .{
2903		- .latitude = json_number.fromDouble(j, allocator, latitude) catch return,
2904		- .longitude = json_number.fromDouble(j, allocator, longitude) catch return,
2905		- .accuracy = json_number.fromDouble(j, allocator, accuracy) catch return,
2906		- .altitude = json_number.fromDouble(j, allocator, altitude) catch return,
2907		- .speed = json_number.fromDouble(j, allocator, speed) catch return,
2908		- .heading = json_number.fromDouble(j, allocator, bearing) catch return,
	2935	+ .latitude = json_number.fromDouble(j, allocator, latitude) catch |err| return failedWithoutFallback("locationResult", err),
	2936	+ .longitude = json_number.fromDouble(j, allocator, longitude) catch |err| return failedWithoutFallback("locationResult", err),
	2937	+ .accuracy = json_number.fromDouble(j, allocator, accuracy) catch |err| return failedWithoutFallback("locationResult", err),
	2938	+ .altitude = json_number.fromDouble(j, allocator, altitude) catch |err| return failedWithoutFallback("locationResult", err),
	2939	+ .speed = json_number.fromDouble(j, allocator, speed) catch |err| return failedWithoutFallback("locationResult", err),
	2940	+ .heading = json_number.fromDouble(j, allocator, bearing) catch |err| return failedWithoutFallback("locationResult", err),
2909	2941	// A long, not a double: `put(String, long)` boxes a Long, and
2910	2942	// `numberToString` prints one with `Long.toString` — which needs no
2911	2943	// JNI call, because there is no float format to reproduce.
2912		- .timestamp = std.fmt.bufPrint(&timestamp, "{d}", .{time}) catch return,
	2944	+ .timestamp = std.fmt.bufPrint(&timestamp, "{d}", .{time}) catch |err| return failedWithoutFallback("locationResult", err),
2913	2945	};
2914	2946
2915		- const json = position.renderPosition(allocator, printed) catch return;
2916		- events.settle(allocator, position.resolve_global, json) catch {};
	2947	+ const json = position.renderPosition(allocator, printed) catch |err| return failedWithoutFallback("locationResult", err);
	2948	+ events.settle(allocator, position.resolve_global, json) catch |err| undelivered("locationResult", err);
2917	2949	}
2918	2950
2919	2951	/// `nativeLocationFailed(message)` — the failure listener.
		⋯12 linesShow the 12 lines above this hunk@@ -2932,10 +2964,10 @@ fn nativeLocationFailed(
2932	2964	const text: []const u8 = if (message == null)
2933	2965	"null"
2934	2966	else
2935		- j.stringToUtf8(allocator, message) catch return;
	2967	+ j.stringToUtf8(allocator, message) catch |err| return failedWithoutFallback("locationFailed", err);
2936	2968
2937		- const json = position.renderRejection(allocator, position.code_client_failure, text) catch return;
2938		- events.settle(allocator, position.reject_global, json) catch {};
	2969	+ const json = position.renderRejection(allocator, position.code_client_failure, text) catch |err| return failedWithoutFallback("locationFailed", err);
	2970	+ events.settle(allocator, position.reject_global, json) catch |err| undelivered("locationFailed", err);
2939	2971	}
2940	2972
2941	2973	/// `nativeGetCurrentPosition(activity)`.
		⋯25 linesShow the 25 lines above this hunk@@ -2967,8 +2999,8 @@ fn nativeGetCurrentPosition(
2967	2999	allocator,
2968	3000	position.code_permission_denied,
2969	3001	position.permission_denied_message,
2970		- ) catch return jni.JNI_FALSE;
2971		- events.settle(allocator, position.reject_global, json) catch return jni.JNI_FALSE;
	3002	+ ) catch |err| return fellThrough("getCurrentPosition", err, jni.JNI_FALSE);
	3003	+ events.settle(allocator, position.reject_global, json) catch |err| return fellThrough("getCurrentPosition", err, jni.JNI_FALSE);
2972	3004	return jni.JNI_TRUE;
2973	3005	}
2974	3006

packages/zig/src/bridge_android_device.zigmodified+16-4

Changes to packages/zig/src/bridge_android_device.zig

		⋯372 linesShow the 372 lines above this hunk@@ -373,11 +373,23 @@ fn readPackageInfo(allocator: std.mem.Allocator, j: Jni, activity: jobject, sdk:
373	373	errdefer allocator.free(version_name);
374	374	allocator.free(fallback.version_name);
375	375
376		- // API 28 split the build number in two: `longVersionCode` is the whole
377		- // value, `versionCode` its low 32 bits. Reading the wrong one on a modern
378		- // app truncates rather than failing.
	376	+ // API 28 split the build number in two: `getLongVersionCode()` is the
	377	+ // whole value, `versionCode` its low 32 bits. Reading the wrong one on a
	378	+ // modern app truncates rather than failing.
	379	+ //
	380	+ // A method, not a field. The Kotlin shim writes `.longVersionCode`, which
	381	+ // Kotlin compiles to a call to the getter — there is no `longVersionCode`
	382	+ // field on PackageInfo at all. This used to ask for one, and the first
	383	+ // time it ran on a device, every call ended in
	384	+ //
	385	+ // java.lang.NoSuchFieldError: no "J" field "longVersionCode" in class
	386	+ // "Landroid/content/pm/PackageInfo;" or its superclasses
	387	+ //
	388	+ // and fell through to the shim. It had never run anywhere before, because
	389	+ // no generated app had ever loaded this library. `versionCode` below is a
	390	+ // genuine public field, deprecated but present.
379	391	const build: i64 = if (sdk >= 28)
380		- try j.longField(info, try j.fieldId(info_cls, "longVersionCode", "J"))
	392	+ try j.callLongMethod(info, try j.methodId(info_cls, "getLongVersionCode", "()J"))
381	393	else
382	394	try j.intField(info, try j.fieldId(info_cls, "versionCode", "I"));
383	395

packages/zig/test/android_declines_test.zigadded+201-0

Changes to packages/zig/test/android_declines_test.zig

		@@ -0,0 +1,201 @@
	1	+//! Every way an Android native gives up has to say so.
	2	+//!
	3	+//! A native in `src/android_dispatch.zig` declines by returning `null` or
	4	+//! `JNI_FALSE`, and the Kotlin shim then serves the action itself. That hand-
	5	+//! back is by design and invisible to the page — which is also what made it
	6	+//! invisible to everyone else. `getDeviceInfo` ran on its first emulator
	7	+//! throwing
	8	+//!
	9	+//! java.lang.NoSuchFieldError: no "J" field "longVersionCode" in class
	10	+//! "Landroid/content/pm/PackageInfo;"
	11	+//!
	12	+//! on every call, and nothing noticed: the page got an answer, the suite
	13	+//! passed, and the only trace was one warning in logcat. About 170 other
	14	+//! failure paths did not even leave that — `catch return null`, `catch {}` —
	15	+//! so a JNI plumbing failure in any of them looked exactly like a native doing
	16	+//! its job.
	17	+//!
	18	+//! They go through three helpers now, each with a distinct message:
	19	+//! `fellThrough`, `failedWithoutFallback` and `undelivered`. The mobile E2E
	20	+//! runtime leg fails on any of those lines, which is what lets it claim Zig
	21	+//! *served* the calls it exercised rather than merely loaded.
	22	+//!
	23	+//! ## The rule
	24	+//!
	25	+//! No `catch` in the dispatcher may discard its error: a `catch` without a
	26	+//! `|capture|` whose handler is only `return`, `return null`,
	27	+//! `return jni.JNI_FALSE`, `null` or `{}` is a silent decline and fails this
	28	+//! test. The compiler already refuses an unused capture, so once the error is
	29	+//! captured it has to go somewhere.
	30	+//!
	31	+//! Two shapes stay allowed, deliberately:
	32	+//!
	33	+//! - `catch return .some_outcome` — returning an enum outcome that the caller
	34	+//! reports. `bindNatives` does this and `JNI_OnLoad` logs every outcome.
	35	+//! - `catch { ... }` with a body — a handler that does something, like the
	36	+//! `saveFile` path that rejects its promise with a specific message.
	37	+//!
	38	+//! Scoped to the dispatcher because that is where declines to Kotlin happen.
	39	+//! The bridge modules return errors with `try` and the dispatcher is what
	40	+//! turns them into a decline.
	41	+
	42	+const std = ;
	43	+const testing = std.testing;
	44	+
	45	+const dispatch = @embedFile("android_dispatch.zig");
	46	+
	47	+const Finding = struct {
	48	+ line: usize,
	49	+ text: []const u8,
	50	+};
	51	+
	52	+/// The first silent decline in `source`, or null if there is none.
	53	+fn firstSilentCatch(source: []const u8) ?Finding {
	54	+ var lines = std.mem.splitScalar(u8, source, '\n');
	55	+ var number: usize = 0;
	56	+ while (lines.next()) |raw| {
	57	+ number += 1;
	58	+ const trimmed = std.mem.trim(u8, raw, " \t\r");
	59	+ // Comments and multiline string lines describe code, they are not code.
	60	+ if (std.mem.startsWith(u8, trimmed, "//") or std.mem.startsWith(u8, trimmed, "\\\\")) continue;
	61	+
	62	+ const code = withoutTrailingComment(raw);
	63	+ var search: usize = 0;
	64	+ while (std.mem.indexOfPos(u8, code, search, "catch")) |at| {
	65	+ search = at + "catch".len;
	66	+ if (!isWordAt(code, at, "catch".len)) continue;
	67	+
	68	+ const rest = std.mem.trimStart(u8, code[search..], " \t");
	69	+ if (isSilentHandler(rest)) return .{ .line = number, .text = trimmed };
	70	+ }
	71	+ }
	72	+ return null;
	73	+}
	74	+
	75	+/// Whether what follows a `catch` discards the error without a capture.
	76	+fn isSilentHandler(rest: []const u8) bool {
	77	+ if (std.mem.startsWith(u8, rest, "|")) return false;
	78	+
	79	+ if (std.mem.startsWith(u8, rest, "{}")) return true;
	80	+ if (std.mem.startsWith(u8, rest, "null")) return !continuesIdentifier(rest, "null".len);
	81	+
	82	+ if (std.mem.startsWith(u8, rest, "return")) {
	83	+ if (continuesIdentifier(rest, "return".len)) return false;
	84	+ const value = std.mem.trimStart(u8, rest["return".len..], " \t");
	85	+ // An enum outcome the caller reports, like `bindNatives`.
	86	+ if (std.mem.startsWith(u8, value, ".")) return false;
	87	+ if (value.len == 0) return true;
	88	+ if (value[0] == ';' or value[0] == ',' or value[0] == ')') return true;
	89	+ if (std.mem.startsWith(u8, value, "null")) return !continuesIdentifier(value, "null".len);
	90	+ if (std.mem.startsWith(u8, value, "jni.JNI_FALSE")) return !continuesIdentifier(value, "jni.JNI_FALSE".len);
	91	+ }
	92	+ return false;
	93	+}
	94	+
	95	+fn continuesIdentifier(text: []const u8, len: usize) bool {
	96	+ if (text.len <= len) return false;
	97	+ const c = text[len];
	98	+ return std.ascii.isAlphanumeric(c) or c == '_';
	99	+}
	100	+
	101	+fn isWordAt(text: []const u8, at: usize, len: usize) bool {
	102	+ const before_ok = at == 0 or !(std.ascii.isAlphanumeric(text[at - 1]) or text[at - 1] == '_');
	103	+ return before_ok and !continuesIdentifier(text[at..], len);
	104	+}
	105	+
	106	+/// `line` up to a `//` that is not inside a string literal.
	107	+///
	108	+/// URLs are why this is not `indexOf("//")`: the dispatcher builds
	109	+/// `https://` strings, and cutting there would hide any `catch` after one.
	110	+fn withoutTrailingComment(line: []const u8) []const u8 {
	111	+ var in_string = false;
	112	+ var i: usize = 0;
	113	+ while (i < line.len) : (i += 1) {
	114	+ const c = line[i];
	115	+ if (in_string) {
	116	+ if (c == '\\') {
	117	+ i += 1;
	118	+ } else if (c == '"') {
	119	+ in_string = false;
	120	+ }
	121	+ } else if (c == '"') {
	122	+ in_string = true;
	123	+ } else if (c == '/' and i + 1 < line.len and line[i + 1] == '/') {
	124	+ return line[0..i];
	125	+ }
	126	+ }
	127	+ return line;
	128	+}
	129	+
	130	+test "the scanner recognises every silent shape the dispatcher used to have" {
	131	+ // Handed both answers before it is trusted with the real file: a scanner
	132	+ // that finds nothing proves nothing until it has been shown to find
	133	+ // something.
	134	+ const silent = [_][]const u8{
	135	+ " const text = j.stringToUtf8(allocator, value) catch return jni.JNI_FALSE;",
	136	+ " const s = foo() catch return null;",
	137	+ " return j.newStringUtf8(allocator, json) catch null;",
	138	+ " events.settle(allocator, global, payload) catch {};",
	139	+ " const text = j.stringToUtf8(allocator, message) catch return;",
	140	+ " .latitude = json_number.fromDouble(j, allocator, latitude) catch return,",
	141	+ " const call = (dbCall(j, allocator, sql) catch return jni.JNI_FALSE) orelse",
	142	+ " const x = (render(allocator) catch return null) orelse",
	143	+ " j.staticMethodId(holder, \"x\", \"()V\") catch return jni.JNI_FALSE,",
	144	+ };
	145	+ for (silent) |line| {
	146	+ if (firstSilentCatch(line) == null) {
	147	+ std.debug.print("\nthe scanner missed a silent decline:\n {s}\n", .{line});
	148	+ return error.ScannerMissedSilentCatch;
	149	+ }
	150	+ }
	151	+
	152	+ const fine = [_][]const u8{
	153	+ " const text = j.stringToUtf8(allocator, value) catch |err| return fellThrough(\"log\", err, jni.JNI_FALSE);",
	154	+ " events.settle(allocator, global, payload) catch |err| undelivered(\"reviewError\", err);",
	155	+ " const cls = j.findClass(holder_class) catch return .class_not_found;",
	156	+ " const plan = files.planFor(data_text) catch {",
	157	+ " // `catch return null` used to be everywhere",
	158	+ " const url = \"https://example.com\"; // catch {} in a comment",
	159	+ " const nullable = returnValue() catch |e| nullOr(e);",
	160	+ };
	161	+ for (fine) |line| {
	162	+ if (firstSilentCatch(line)) |finding| {
	163	+ std.debug.print("\nthe scanner flagged a handled catch:\n {s}\n", .{finding.text});
	164	+ return error.ScannerFlaggedHandledCatch;
	165	+ }
	166	+ }
	167	+}
	168	+
	169	+test "no native in the Android dispatcher declines without saying so" {
	170	+ if (firstSilentCatch(dispatch)) |finding| {
	171	+ std.debug.print(
	172	+ \\
	173	+ \\src/android_dispatch.zig:{d} declines without saying so:
	174	+ \\
	175	+ \\ {s}
	176	+ \\
	177	+ \\A native that gives up here hands the action back to the Kotlin shim
	178	+ \\(or, from a callback, drops it) with nothing in logcat — the page still
	179	+ \\gets an answer, so the failure is invisible. Capture the error and route
	180	+ \\it through `fellThrough`, `failedWithoutFallback` or `undelivered`.
	181	+ \\
	182	+ , .{ finding.line, finding.text });
	183	+ return error.SilentDecline;
	184	+ }
	185	+}
	186	+
	187	+test "the three decline messages are the ones the E2E suite looks for" {
	188	+ // scripts/mobile-e2e/android.ts fails its runtime leg on these phrases. If
	189	+ // a helper's wording drifted, the suite would stop seeing declines and pass
	190	+ // on a runtime that was handing every call to Kotlin.
	191	+ for ([_][]const u8{
	192	+ " fell through to the shim (",
	193	+ " failed with no fallback (",
	194	+ " could not reach the page (",
	195	+ }) |phrase| {
	196	+ if (std.mem.indexOf(u8, dispatch, phrase) == null) {
	197	+ std.debug.print("\nandroid_dispatch.zig no longer contains \"{s}\"\n", .{phrase});
	198	+ return error.DeclinePhraseMissing;
	199	+ }
	200	+ }
	201	+}

scripts/mobile-e2e/android.tsmodified+24-10

Changes to scripts/mobile-e2e/android.ts

		⋯1 lineShow the 1 line above this hunk@@ -2,7 +2,7 @@ import type { LegOutcome, RunnerOptions } from './types'
2	2	import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
3	3	import { join } from 'node:path'
4	4	import { init } from '../../packages/android/src/index'
5		-import { evaluateRun, hasTerminated } from './protocol'
	5	+import { androidDeclines, evaluateRun, hasTerminated } from './protocol'
6	6	import { command, driverPage, waitForFile } from './support'
7	7
8	8	/**
		⋯180 linesShow the 180 lines above this hunk@@ -189,17 +189,23 @@ async function runLeg(leg: Leg, options: RunnerOptions): Promise<LegOutcome> {
189	189	failures.push(`the bridge reported sdkVersion ${observed[1]} but the device says ${sdk}`)
190	190	}
191	191
192		- // Did the Zig runtime actually load and bind? JNI_OnLoad says so itself, on
193		- // the happy path as well as the failure ones — which is deliberate, because
194		- // "loaded and bound" and "never shipped" are otherwise both silent, and this
195		- // is also the only line that proves the log channel is working rather than
196		- // merely quiet.
	192	+ // Did the Zig runtime load, bind — and then actually answer? JNI_OnLoad
	193	+ // reports the first two on the happy path as well as the failure ones, and
	194	+ // every way a native can give up now says so too (android_dispatch.zig's
	195	+ // fellThrough / failedWithoutFallback / undelivered).
197	196	//
198		- // There is no per-action dispatch line to count the way the iOS legs do.
199		- // Binding is the gate instead: once the natives are registered, every
200		- // CraftNative wrapper returns a value and the Kotlin falls through to Zig
201		- // rather than the other way round.
	197	+ // Registration alone is not enough, and the first run that loaded this
	198	+ // library showed why: "registered 103 natives", every case passed, and
	199	+ // getDeviceInfo threw NoSuchFieldError on every call and handed it to Kotlin.
	200	+ // The page could not tell. So the runtime leg asks for both halves: bound,
	201	+ // and not one decline while the page ran.
	202	+ //
	203	+ // Read from the full buffer, not the filtered dump: the stack trace ART
	204	+ // prints for the underlying Java exception is under System.err, which is
	205	+ // the part worth quoting back.
202	206	const registered = logText.match(REGISTERED)
	207	+ const fullLog = existsSync(join(evidence, 'logcat-full.txt')) ? readFileSync(join(evidence, 'logcat-full.txt'), 'utf8') : logText
	208	+ const declines = androidDeclines(fullLog)
203	209	const zigActions: string[] = []
204	210
205	211	if (leg.requireZig) {
		⋯6 linesShow the 6 lines above this hunk@@ -212,6 +218,14 @@ async function runLeg(leg: Leg, options: RunnerOptions): Promise<LegOutcome> {
212	218	else {
213	219	zigActions.push(`registered:${registered[1]}`)
214	220	}
	221	+
	222	+ for (const decline of declines) {
	223	+ failures.push(
	224	+ `Zig declined while the page ran — ${decline}. The case still passed because Kotlin answered instead, `
	225	+ + `which is exactly what this leg exists to see; the Java exception, if any, is under System.err in ${label}/logcat-full.txt`,
	226	+ )
	227	+ }
	228	+ if (registered && !declines.length) zigActions.push('declines:0')
215	229	}
216	230	else if (registered) {
217	231	failures.push(`the shim leg registered ${registered[1]} natives; it was generated with no runtime`)

scripts/mobile-e2e/protocol.test.tsmodified+44-1

Changes to scripts/mobile-e2e/protocol.test.ts

		@@ -1,5 +1,7 @@
1	1	import { describe, expect, it } from 'bun:test'
2		-import { evaluateRun, hasTerminated, parseDriverOutput, REQUIRED_CASES, requiredCaseProblems, ZIG_REFUSED_ACTION, ZIG_TESTED_ACTIONS, zigDispatchedActions, zigRefusals } from './protocol'
	2	+import { readFileSync } from 'node:fs'
	3	+import { join } from 'node:path'
	4	+import { ANDROID_DECLINE_PHRASES, androidDeclines, evaluateRun, hasTerminated, parseDriverOutput, REQUIRED_CASES, requiredCaseProblems, ZIG_REFUSED_ACTION, ZIG_TESTED_ACTIONS, zigDispatchedActions, zigRefusals } from './protocol'
3	5
4	6	const ESC = String.fromCharCode(27)
5	7
		⋯270 linesShow the 270 lines above this hunk@@ -276,3 +278,44 @@ describe('zig attribution', () => {
276	278	expect(ZIG_TESTED_ACTIONS).toContain(ZIG_REFUSED_ACTION)
277	279	})
278	280	})
	281	+
	282	+describe('android declines', () => {
	283	+ // The lines the first Android runtime run actually produced, plus the two
	284	+ // decline kinds it did not hit, so all three are read the way they are
	285	+ // written.
	286	+ const logcat = [
	287	+ '09-16 11:29:24.000 2611 2611 I CraftNative: craft: libcraft.so loaded',
	288	+ '09-16 11:29:24.001 2611 2611 I CraftNative: craft: registered 103 natives on com/craft/runtime/CraftNative',
	289	+ '09-16 11:29:24.535 2611 2705 W System.err: java.lang.NoSuchFieldError: no "J" field "longVersionCode"',
	290	+ '09-16 11:29:24.535 2611 2705 W CraftNative: craft: getDeviceInfo fell through to the shim (JavaException)',
	291	+ '09-16 11:29:25.000 2611 2705 E CraftNative: craft: locationResult failed with no fallback (OutOfMemory)',
	292	+ '09-16 11:29:26.000 2611 2705 E CraftNative: craft: reviewError could not reach the page (NoWebView)',
	293	+ '09-16 11:29:26.100 2611 2705 D CraftBridge: CRAFT-E2E {"event":"done","passed":4,"failed":0}',
	294	+ ].join('\n')
	295	+
	296	+ it('reads every kind of decline, and names the action and the error', () => {
	297	+ expect(androidDeclines(logcat)).toEqual([
	298	+ 'getDeviceInfo: fell through to the shim (JavaException)',
	299	+ 'locationResult: failed with no fallback (OutOfMemory)',
	300	+ 'reviewError: could not reach the page (NoWebView)',
	301	+ ])
	302	+ })
	303	+
	304	+ // The case that shipped: bound, every page case passing, and Kotlin
	305	+ // answering. Registration is not a decline and must not be read as one —
	306	+ // and a run with nothing but registration is the clean result.
	307	+ it('does not mistake loading or registration for a decline', () => {
	308	+ const clean = logcat.split('\n').filter(line => !/fell through|no fallback|reach the page/.test(line)).join('\n')
	309	+ expect(androidDeclines(clean)).toEqual([])
	310	+ })
	311	+
	312	+ it('matches the wording android_dispatch.zig actually writes', () => {
	313	+ // Read from the Zig source rather than trusted, because each side alone
	314	+ // would let a reworded helper turn the runtime leg blind: Zig would log a
	315	+ // phrase this suite no longer matched, and every decline would pass.
	316	+ const dispatch = readFileSync(join(import.meta.dir, '../../packages/zig/src/android_dispatch.zig'), 'utf8')
	317	+ for (const phrase of ANDROID_DECLINE_PHRASES)
	318	+ expect(dispatch).toContain(`" ${phrase} ({s})"`)
	319	+ })
	320	+})
	321	+

scripts/mobile-e2e/protocol.tsmodified+37-0

Changes to scripts/mobile-e2e/protocol.ts

		⋯356 linesShow the 356 lines above this hunk@@ -357,3 +357,40 @@ export const ZIG_TESTED_ACTIONS = [
357	357
358	358	/** The one action the suite configures off, so Zig must refuse it by name. */
359	359	export const ZIG_REFUSED_ACTION = 'getCurrentPosition'
	360	+
	361	+/**
	362	+ * The three ways an Android native says it gave up, as `android_dispatch.zig`
	363	+ * writes them.
	364	+ *
	365	+ * - fell through to the shim: Kotlin served the action instead of Zig.
	366	+ * - failed with no fallback: a callback into Zig gave up, and nothing will.
	367	+ * - could not reach the page: Zig had the answer and could not deliver it.
	368	+ *
	369	+ * `test/android_declines_test.zig` keeps every decline routed through one of
	370	+ * these, and `protocol.test.ts` reads the Zig source to check the wording has
	371	+ * not drifted from what is matched here. Either half alone would let the suite
	372	+ * stop seeing declines and keep passing.
	373	+ */
	374	+export const ANDROID_DECLINE_PHRASES = [
	375	+ 'fell through to the shim',
	376	+ 'failed with no fallback',
	377	+ 'could not reach the page',
	378	+]
	379	+
	380	+/**
	381	+ * Every Android decline line in a logcat dump, as `action: phrase (error)`.
	382	+ *
	383	+ * Why the runtime leg needs this rather than the registration line alone: the
	384	+ * first run in which the Zig library loaded reported "registered 103 natives"
	385	+ * and passed every case — while `getDeviceInfo` threw `NoSuchFieldError` on
	386	+ * every call and Kotlin quietly answered instead. Registration proves the
	387	+ * library bound. Only the absence of declines, with every decline made to
	388	+ * speak, proves Zig answered.
	389	+ */
	390	+export function androidDeclines(text: string): string[] {
	391	+ const plain = text.replace(ANSI, '')
	392	+ const phrases = ANDROID_DECLINE_PHRASES.map(phrase => phrase.replace(/ /g, '\\s')).join('|')
	393	+ const pattern = new RegExp(`craft: (\\w+) (${phrases}) \\(([^)]*)\\)`, 'g')
	394	+ return [...plain.matchAll(pattern)].map(match => `${match[1]}: ${match[2]} (${match[3]})`)
	395	+}
	396	+