fix(android): recover remote loads after connectivity returns

Review threads live on the whole diff, not on one commit, so none are shown here - a thread's line means something in the branch's final form, and painting it into an intermediate step would put it on code it is not about.

packages/android/compile-fixtures/CraftLoadFailureTest.ktadded+22-0

Changes to packages/android/compile-fixtures/CraftLoadFailureTest.kt

		@@ -0,0 +1,22 @@
	1	+package {{PACKAGE_NAME}}
	2	+
	3	+import android.webkit.WebViewClient
	4	+import org.junit.Assert.assertFalse
	5	+import org.junit.Assert.assertTrue
	6	+import org.junit.Test
	7	+
	8	+class CraftLoadFailureTest {
	9	+ @Test
	10	+ fun onlyConnectivityFailuresUseTheBundledCopy() {
	11	+ assertTrue(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_HOST_LOOKUP))
	12	+ assertTrue(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_CONNECT))
	13	+ assertTrue(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_TIMEOUT))
	14	+ assertTrue(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_IO))
	15	+
	16	+ assertFalse(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_FAILED_SSL_HANDSHAKE))
	17	+ assertFalse(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_AUTHENTICATION))
	18	+ assertFalse(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_UNSUPPORTED_AUTH_SCHEME))
	19	+ assertFalse(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_BAD_URL))
	20	+ assertFalse(CraftLoadFailure.isUnreachable(WebViewClient.ERROR_UNSAFE_RESOURCE))
	21	+ }
	22	+}

packages/android/scripts/compile-templates.tsmodified+14-9

Changes to packages/android/scripts/compile-templates.ts

		@@ -1,4 +1,4 @@
1		-import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
	1	+import { mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs'
2	2	import { tmpdir } from 'node:os'
3	3	import { dirname, join } from 'node:path'
4	4	import { fileURLToPath } from 'node:url'
		⋯8 linesShow the 8 lines above this hunk@@ -13,10 +13,13 @@ interface CompileFixture {
13	13
14	14	const scriptDirectory = dirname(fileURLToPath(import.meta.url))
15	15	const packageDirectory = dirname(scriptDirectory)
16		-const permissionTestTemplate = readFileSync(
17		- join(packageDirectory, 'compile-fixtures/CraftPermissionPolicyTest.kt'),
18		- 'utf8',
19		-)
	16	+const compileFixtureDirectory = join(packageDirectory, 'compile-fixtures')
	17	+const compileTestTemplates = readdirSync(compileFixtureDirectory, { withFileTypes: true })
	18	+ .filter(entry => entry.isFile() && entry.name.endsWith('Test.kt'))
	19	+ .map(entry => ({
	20	+ name: entry.name,
	21	+ source: readFileSync(join(compileFixtureDirectory, entry.name), 'utf8'),
	22	+ }))
20	23	const gradleExecutable = process.env.GRADLE_EXECUTABLE || 'gradle'
21	24	const keepProjects = process.argv.includes('--keep')
22	25	const workspace = mkdtempSync(join(tmpdir(), 'craft-android-templates-'))
		⋯69 linesShow the 69 lines above this hunk@@ -92,10 +95,12 @@ try {
92	95	fixture.packageName.replaceAll('.', '/'),
93	96	)
94	97	mkdirSync(testDirectory, { recursive: true })
95		- writeFileSync(
96		- join(testDirectory, 'CraftPermissionPolicyTest.kt'),
97		- permissionTestTemplate.replaceAll('', fixture.packageName),
98		- )
	98	+ for (const testTemplate of compileTestTemplates) {
	99	+ writeFileSync(
	100	+ join(testDirectory, testTemplate.name),
	101	+ testTemplate.source.replaceAll('', fixture.packageName),
	102	+ )
	103	+ }
99	104
100	105	console.log(`\nCompiling generated Android fixture: ${fixture.name}`)
101	106	const result = Bun.spawnSync([

packages/android/src/index.test.tsmodified+23-1

Changes to packages/android/src/index.test.ts

		⋯305 linesShow the 305 lines above this hunk@@ -306,7 +306,29 @@ describe('Craft Android builder', () => {
306	306	const config = JSON.parse(readFileSync(join(output, 'app/src/main/assets/craft.config.json'), 'utf8'))
307	307	const activity = readFileSync(join(output, 'app/src/main/java/org/wildloop/app/MainActivity.kt'), 'utf8')
308	308	expect(config.hasBundledFallback).toBe(true)
309		- expect(activity).toContain('hasBundledFallback && !loadedBundledFallback')
	309	+
	310	+ // #254: only a main-frame connectivity failure may hide the remote page
	311	+ // behind the bundled copy. TLS, authentication, and bad-response failures
	312	+ // must remain visible instead of looking like a successful offline launch.
	313	+ const failureHandler = activity.slice(
	314	+ activity.indexOf('override fun onReceivedError('),
	315	+ activity.indexOf('webView.webChromeClient = WebChromeClient()'),
	316	+ )
	317	+ expect(failureHandler).toContain('CraftLoadFailure.isUnreachable(error.errorCode)')
	318	+ expect(failureHandler).not.toContain('hasBundledFallback && !loadedBundledFallback')
	319	+
	320	+ // Falling back is no longer one-way. Bound the assertion to the named
	321	+ // recovery method so the field declaration cannot make this pass alone.
	322	+ const recovery = activity.slice(
	323	+ activity.indexOf('private fun returnFromBundledFallback('),
	324	+ activity.indexOf('private fun loadContent()'),
	325	+ )
	326	+ expect(recovery).toContain('loadedBundledFallback = false')
	327	+ expect(recovery).toContain('webView.loadUrl(remoteUrl)')
	328	+
	329	+ expect(activity).toContain('returnFromBundledFallback("the app returned to the foreground")')
	330	+ expect(activity).toContain('val wasConnected = isConnected')
	331	+ expect(activity).toContain('if (!wasConnected && isConnected) {')
310	332	})
311	333
312	334	it('delivers shortcut activations and refuses impossible event streams', async () => {

packages/android/templates/MainActivity.kt.templatemodified+71-1

Changes to packages/android/templates/MainActivity.kt.template

		@@ -1,10 +1,14 @@
1	1	package
2	2
3	3	import android.annotation.SuppressLint
	4	+import android.content.Context
4	5	import android.os.Bundle
5	6	import android.content.Intent
6	7	import android.graphics.Bitmap
	8	+import android.net.ConnectivityManager
	9	+import android.net.Network
7	10	import android.net.Uri
	11	+import android.util.Log
8	12	import android.webkit.WebResourceRequest
9	13	import android.webkit.WebResourceError
10	14	import android.webkit.WebResourceResponse
		⋯8 linesShow the 8 lines above this hunk@@ -19,6 +23,20 @@ import org.json.JSONObject
19	23	import java.io.FileNotFoundException
20	24	import java.net.URLConnection
21	25
	26	+/** Main-frame failures for which the bundled app is an honest fallback (#254). */
	27	+object CraftLoadFailure {
	28	+ fun isUnreachable(errorCode: Int): Boolean = when (errorCode) {
	29	+ WebViewClient.ERROR_HOST_LOOKUP,
	30	+ WebViewClient.ERROR_CONNECT,
	31	+ WebViewClient.ERROR_TIMEOUT,
	32	+ // Android uses ERROR_IO for connection interruptions as well as local
	33	+ // I/O failures. Keep it here deliberately: it is the closest Android
	34	+ // equivalent to iOS's NSURLErrorNetworkConnectionLost.
	35	+ WebViewClient.ERROR_IO -> true
	36	+ else -> false
	37	+ }
	38	+}
	39	+
22	40	class MainActivity : AppCompatActivity() {
23	41	private lateinit var webView: WebView
24	42	private lateinit var craftBridge: CraftBridge
		⋯7 linesShow the 7 lines above this hunk@@ -32,6 +50,28 @@ class MainActivity : AppCompatActivity() {
32	50	.build()
33	51	}
34	52	private var loadedBundledFallback = false
	53	+ private lateinit var connectivityManager: ConnectivityManager
	54	+ @Volatile
	55	+ private var isConnected = false
	56	+ private var networkMonitoringRegistered = false
	57	+ private val networkCallback = object : ConnectivityManager.NetworkCallback() {
	58	+ override fun onAvailable(network: Network) {
	59	+ val wasConnected = isConnected
	60	+ isConnected = true
	61	+ if (!wasConnected && isConnected) {
	62	+ runOnUiThread {
	63	+ returnFromBundledFallback("the network came back")
	64	+ }
	65	+ }
	66	+ }
	67	+
	68	+ override fun onLost(network: Network) {
	69	+ // A second transport can already be the default by the time the
	70	+ // old one reports its loss, so read current state instead of
	71	+ // blindly turning the latch off.
	72	+ isConnected = connectivityManager.activeNetwork != null
	73	+ }
	74	+ }
35	75
36	76	@SuppressLint("SetJavaScriptEnabled")
37	77	override fun onCreate(savedInstanceState: Bundle?) {
		⋯30 linesShow the 30 lines above this hunk@@ -68,6 +108,7 @@ class MainActivity : AppCompatActivity() {
68	108
69	109	setupWebView()
70	110	loadContent()
	111	+ setupNetworkMonitoring()
71	112	}
72	113
73	114	@SuppressLint("SetJavaScriptEnabled")
		⋯39 linesShow the 39 lines above this hunk@@ -113,7 +154,13 @@ class MainActivity : AppCompatActivity() {
113	154
114	155	override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
115	156	super.onReceivedError(view, request, error)
116		- if (request?.isForMainFrame == true && hasBundledFallback && !loadedBundledFallback) {
	157	+ if (
	158	+ request?.isForMainFrame == true &&
	159	+ error != null &&
	160	+ CraftLoadFailure.isUnreachable(error.errorCode) &&
	161	+ hasBundledFallback &&
	162	+ !loadedBundledFallback
	163	+ ) {
117	164	loadedBundledFallback = true
118	165	webView.loadUrl(BUNDLED_APP_URL)
119	166	}
		⋯6 linesShow the 6 lines above this hunk@@ -126,6 +173,23 @@ class MainActivity : AppCompatActivity() {
126	173	webView.addJavascriptInterface(craftBridge, "CraftAndroid")
127	174	}
128	175
	176	+ private fun setupNetworkMonitoring() {
	177	+ if (!hasBundledFallback || devServerUrl == null) return
	178	+ connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
	179	+ isConnected = connectivityManager.activeNetwork != null
	180	+ connectivityManager.registerDefaultNetworkCallback(networkCallback)
	181	+ networkMonitoringRegistered = true
	182	+ }
	183	+
	184	+ /** Leave the bundled copy for the configured remote origin again. */
	185	+ private fun returnFromBundledFallback(reason: String) {
	186	+ val remoteUrl = devServerUrl ?: return
	187	+ if (!loadedBundledFallback) return
	188	+ loadedBundledFallback = false
	189	+ Log.i(TAG, "$reason; loading $remoteUrl again instead of the bundled copy")
	190	+ webView.loadUrl(remoteUrl)
	191	+ }
	192	+
129	193	private fun loadContent() {
130	194	// Check for dev server URL in config
131	195	val remoteUrl = devServerUrl
		⋯102 linesShow the 102 lines above this hunk@@ -234,6 +298,7 @@ class MainActivity : AppCompatActivity() {
234	298	override fun onResume() {
235	299	super.onResume()
236	300	webView.onResume()
	301	+ returnFromBundledFallback("the app returned to the foreground")
237	302	}
238	303
239	304	override fun onPause() {
		⋯2 linesShow the 2 lines above this hunk@@ -242,6 +307,10 @@ class MainActivity : AppCompatActivity() {
242	307	}
243	308
244	309	override fun onDestroy() {
	310	+ if (networkMonitoringRegistered) {
	311	+ connectivityManager.unregisterNetworkCallback(networkCallback)
	312	+ networkMonitoringRegistered = false
	313	+ }
245	314	craftBridge.close()
246	315	webView.destroy()
247	316	super.onDestroy()
		⋯15 linesShow the 15 lines above this hunk@@ -263,6 +332,7 @@ class MainActivity : AppCompatActivity() {
263	332	}
264	333
265	334	companion object {
	335	+ private const val TAG = "CraftMainActivity"
266	336	private const val BUNDLED_APP_HOST = "appassets.androidplatform.net"
267	337	private const val BUNDLED_APP_ORIGIN = "https://appassets.androidplatform.net"
268	338	private const val BUNDLED_APP_URL = "$BUNDLED_APP_ORIGIN/"