@craft-native/android 0.0.92 → 0.0.95

package/templates/MainActivity.kt.template

@@ -1,10 +1,14 @@
 package {{PACKAGE_NAME}}
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.os.Bundle
 import android.content.Intent
 import android.graphics.Bitmap
+import android.net.ConnectivityManager
+import android.net.Network
 import android.net.Uri
+import android.util.Log
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceError
 import android.webkit.WebResourceResponse
@@ -19,6 +23,20 @@ import org.json.JSONObject
 import java.io.FileNotFoundException
 import java.net.URLConnection
 
+/** Main-frame failures for which the bundled app is an honest fallback (#254). */
+object CraftLoadFailure {
+    fun isUnreachable(errorCode: Int): Boolean = when (errorCode) {
+        WebViewClient.ERROR_HOST_LOOKUP,
+        WebViewClient.ERROR_CONNECT,
+        WebViewClient.ERROR_TIMEOUT,
+        // Android uses ERROR_IO for connection interruptions as well as local
+        // I/O failures. Keep it here deliberately: it is the closest Android
+        // equivalent to iOS's NSURLErrorNetworkConnectionLost.
+        WebViewClient.ERROR_IO -> true
+        else -> false
+    }
+}
+
 class MainActivity : AppCompatActivity() {
     private lateinit var webView: WebView
     private lateinit var craftBridge: CraftBridge
@@ -32,6 +50,28 @@ class MainActivity : AppCompatActivity() {
             .build()
     }
     private var loadedBundledFallback = false
+    private lateinit var connectivityManager: ConnectivityManager
+    @Volatile
+    private var isConnected = false
+    private var networkMonitoringRegistered = false
+    private val networkCallback = object : ConnectivityManager.NetworkCallback() {
+        override fun onAvailable(network: Network) {
+            val wasConnected = isConnected
+            isConnected = true
+            if (!wasConnected && isConnected) {
+                runOnUiThread {
+                    returnFromBundledFallback("the network came back")
+                }
+            }
+        }
+
+        override fun onLost(network: Network) {
+            // A second transport can already be the default by the time the
+            // old one reports its loss, so read current state instead of
+            // blindly turning the latch off.
+            isConnected = connectivityManager.activeNetwork != null
+        }
+    }
 
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -46,21 +86,29 @@ class MainActivity : AppCompatActivity() {
         craftBridge = CraftBridge(this, webView, CraftHealthConnect(this, webView))
         // The link that launched the app (#215). Queued until the page's bridge
         // is injected, then dispatched once with `initial: true`, so a page that
-        // subscribes rather than calling getInitialURL still hears it. A
-        // relaunch from Recents carries the old intent, and was not opened by it.
-        // A recreated activity restores what the bridge saved: its intent may
-        // be a later warm link that onNewIntent set.
+        // subscribes rather than calling getInitialURL still hears it.
+        //
+        // A relaunch from Recents carries the intent the app was first opened
+        // with. The person picked the task out of a list, not the link or the
+        // shortcut inside it, and neither is news the second time — so both
+        // are skipped, not just the link (#229).
+        //
+        // A recreated activity restores what the bridge saved rather than
+        // reading its intent, which onNewIntent may have replaced with a
+        // later warm link.
+        val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
         if (savedInstanceState == null) {
-            val launchLink = intent.data?.toString()
-            val launchedFromHistory = intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0
-            if (launchLink != null && !launchedFromHistory) craftBridge.receiveDeepLink(launchLink)
+            if (!launchedFromHistory) {
+                intent.data?.toString()?.let(craftBridge::receiveDeepLink)
+                handleIncomingShortcut(intent)
+            }
         } else {
             craftBridge.restoreDeepLinks(savedInstanceState)
         }
-        if (savedInstanceState == null) handleIncomingShortcut(intent)
 
         setupWebView()
         loadContent()
+        setupNetworkMonitoring()
     }
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -106,7 +154,13 @@ class MainActivity : AppCompatActivity() {
 
             override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
                 super.onReceivedError(view, request, error)
-                if (request?.isForMainFrame == true && hasBundledFallback && !loadedBundledFallback) {
+                if (
+                    request?.isForMainFrame == true &&
+                    error != null &&
+                    CraftLoadFailure.isUnreachable(error.errorCode) &&
+                    hasBundledFallback &&
+                    !loadedBundledFallback
+                ) {
                     loadedBundledFallback = true
                     webView.loadUrl(BUNDLED_APP_URL)
                 }
@@ -119,6 +173,23 @@ class MainActivity : AppCompatActivity() {
         webView.addJavascriptInterface(craftBridge, "CraftAndroid")
     }
 
+    private fun setupNetworkMonitoring() {
+        if (!hasBundledFallback || devServerUrl == null) return
+        connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        isConnected = connectivityManager.activeNetwork != null
+        connectivityManager.registerDefaultNetworkCallback(networkCallback)
+        networkMonitoringRegistered = true
+    }
+
+    /** Leave the bundled copy for the configured remote origin again. */
+    private fun returnFromBundledFallback(reason: String) {
+        val remoteUrl = devServerUrl ?: return
+        if (!loadedBundledFallback) return
+        loadedBundledFallback = false
+        Log.i(TAG, "$reason; loading $remoteUrl again instead of the bundled copy")
+        webView.loadUrl(remoteUrl)
+    }
+
     private fun loadContent() {
         // Check for dev server URL in config
         val remoteUrl = devServerUrl
@@ -227,6 +298,7 @@ class MainActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
         webView.onResume()
+        returnFromBundledFallback("the app returned to the foreground")
     }
 
     override fun onPause() {
@@ -235,6 +307,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onDestroy() {
+        if (networkMonitoringRegistered) {
+            connectivityManager.unregisterNetworkCallback(networkCallback)
+            networkMonitoringRegistered = false
+        }
         craftBridge.close()
         webView.destroy()
         super.onDestroy()
@@ -256,6 +332,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
+        private const val TAG = "CraftMainActivity"
         private const val BUNDLED_APP_HOST = "appassets.androidplatform.net"
         private const val BUNDLED_APP_ORIGIN = "https://appassets.androidplatform.net"
         private const val BUNDLED_APP_URL = "$BUNDLED_APP_ORIGIN/"

package/LICENSE.md

@@ -1,21 +0,0 @@
-# MIT License
-
-Copyright (c) 2025 Stacks.js
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.