From 2a249b8a489ad2b97f0732fdc270b5d56fa26232 Mon Sep 17 00:00:00 2001
From: archipelago <archipelago@localhost>
Date: Tue, 23 Jun 2026 03:48:58 -0400
Subject: [PATCH] feat(android): companion in-app WebView footer controls +
 loader; shared debug key; v0.4.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- InAppBrowser now has a bottom control bar (back/forward/reload/open-in-browser/
  close) mirroring the web mobile footer, plus a centered loading screen
  (app favicon + progress bar) instead of a bare top bar over black.
- Commit a repo-dedicated debug keystore and pin signingConfigs.debug to it so
  every machine — and the published companion download — signs debug builds with
  the SAME key (fixes "App not installed" signature-mismatch on update). Force v1+v2.
- Bump versionCode 10→11, versionName 0.4.6→0.4.7.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 Android/.gitignore                            |   5 +
 Android/app/build.gradle.kts                  |  24 +-
 Android/app/debug.keystore                    | Bin 0 -> 2666 bytes
 .../app/ui/screens/WebViewScreen.kt           | 239 ++++++++++++------
 4 files changed, 185 insertions(+), 83 deletions(-)
 create mode 100644 Android/app/debug.keystore

diff --git a/Android/.gitignore b/Android/.gitignore
index 9262b1ed..4cac341c 100644
--- a/Android/.gitignore
+++ b/Android/.gitignore
@@ -14,3 +14,8 @@ local.properties
 *.aab
 *.jks
 *.keystore
+# Exception: the repo-dedicated *debug* keystore is committed on purpose so every
+# machine (and the published companion download) signs debug builds identically —
+# updates then install over the top without an uninstall. Debug keys are not
+# secret (well-known password "android"); never commit a real release keystore.
+!/app/debug.keystore
diff --git a/Android/app/build.gradle.kts b/Android/app/build.gradle.kts
index 36a5b644..84ba81f9 100644
--- a/Android/app/build.gradle.kts
+++ b/Android/app/build.gradle.kts
@@ -11,20 +11,40 @@ android {
         applicationId = "com.archipelago.app"
         minSdk = 26
         targetSdk = 35
-        versionCode = 10
-        versionName = "0.4.6"
+        versionCode = 11
+        versionName = "0.4.7"
 
         vectorDrawables {
             useSupportLibrary = true
         }
     }
 
+    signingConfigs {
+        // Repo-dedicated debug keystore (committed at app/debug.keystore) so every
+        // machine — and the published companion download — signs debug builds with
+        // the SAME key. Without this, Gradle falls back to each machine's
+        // ~/.android/debug.keystore, so a build from a different machine has a
+        // different signature and the phone rejects the update ("App not installed").
+        getByName("debug") {
+            storeFile = file("debug.keystore")
+            storePassword = "android"
+            keyAlias = "androiddebugkey"
+            keyPassword = "android"
+            // Force both legacy JAR (v1) and APK Signature Scheme v2. AGP drops v1
+            // for minSdk>=24, but some OEM package installers (e.g. Samsung) reject
+            // a v2-only sideload with "App not installed" — keep v1 for max compat.
+            enableV1Signing = true
+            enableV2Signing = true
+        }
+    }
+
     buildTypes {
         debug {
             // Separate app ID so a debug/test build installs alongside the
             // release app instead of colliding on signature.
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
+            signingConfig = signingConfigs.getByName("debug")
         }
         release {
             isMinifyEnabled = true
diff --git a/Android/app/debug.keystore b/Android/app/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..d99c47cff89f464f8caeb926d45dfec4bdbebf2f
GIT binary patch
literal 2666
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

literal 0
HcmV?d00001

diff --git a/Android/app/src/main/java/com/archipelago/app/ui/screens/WebViewScreen.kt b/Android/app/src/main/java/com/archipelago/app/ui/screens/WebViewScreen.kt
index 1ef01c9b..9dbfd687 100644
--- a/Android/app/src/main/java/com/archipelago/app/ui/screens/WebViewScreen.kt
+++ b/Android/app/src/main/java/com/archipelago/app/ui/screens/WebViewScreen.kt
@@ -14,6 +14,7 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -27,11 +28,17 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowForward
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.CloudOff
 import androidx.compose.material.icons.filled.OpenInBrowser
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
@@ -45,6 +52,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -430,9 +439,11 @@ fun WebViewScreen(
 
 /**
  * Lightweight in-app browser used when the kiosk hands off an app that can't be
- * shown in an iframe. Loads the app in a local WebView with a minimal top bar
- * (close + title + escalate-to-real-browser). Same-host navigation stays here;
- * any genuinely external link escapes to the phone's browser.
+ * shown in an iframe. Loads the app in a local WebView with a centered loading
+ * screen (app favicon + progress bar) and a BOTTOM control bar mirroring the
+ * web mobile-iframe footer (back / forward / reload / open-in-browser / close).
+ * Same-host navigation stays here; any genuinely external link escapes to the
+ * phone's browser.
  */
 @SuppressLint("SetJavaScriptEnabled")
 @Composable
@@ -444,8 +455,11 @@ private fun InAppBrowser(
     val context = LocalContext.current
     var browser by remember { mutableStateOf<WebView?>(null) }
     var title by remember { mutableStateOf(android.net.Uri.parse(url).host ?: url) }
+    var favicon by remember { mutableStateOf<Bitmap?>(null) }
     var progress by remember { mutableIntStateOf(0) }
     var loading by remember { mutableStateOf(true) }
+    var canGoBack by remember { mutableStateOf(false) }
+    var canGoForward by remember { mutableStateOf(false) }
 
     // Back: walk the in-app history first, then close the overlay.
     BackHandler {
@@ -459,13 +473,152 @@ private fun InAppBrowser(
             .background(SurfaceBlack)
             .windowInsetsPadding(WindowInsets.safeDrawing),
     ) {
+        // WebView + loading overlay fill the area above the bottom control bar.
+        Box(modifier = Modifier.weight(1f).fillMaxWidth()) {
+            AndroidView(
+                modifier = Modifier.fillMaxSize(),
+                factory = { ctx ->
+                    WebView(ctx).apply {
+                        layoutParams = ViewGroup.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                        )
+                        isVerticalScrollBarEnabled = false
+                        isHorizontalScrollBarEnabled = false
+
+                        CookieManager.getInstance().setAcceptThirdPartyCookies(this, true)
+                        applyArchipelagoSettings()
+
+                        webChromeClient = object : WebChromeClient() {
+                            override fun onProgressChanged(view: WebView?, newProgress: Int) {
+                                progress = newProgress
+                            }
+
+                            override fun onReceivedTitle(view: WebView?, t: String?) {
+                                if (!t.isNullOrBlank()) title = t
+                            }
+
+                            override fun onReceivedIcon(view: WebView?, icon: Bitmap?) {
+                                if (icon != null) favicon = icon
+                            }
+                        }
+
+                        webViewClient = object : WebViewClient() {
+                            override fun onPageStarted(view: WebView?, u: String?, favicon: Bitmap?) {
+                                loading = true
+                            }
+
+                            override fun onPageFinished(view: WebView?, u: String?) {
+                                loading = false
+                                canGoBack = view?.canGoBack() == true
+                                canGoForward = view?.canGoForward() == true
+                            }
+
+                            override fun doUpdateVisitedHistory(view: WebView?, u: String?, isReload: Boolean) {
+                                canGoBack = view?.canGoBack() == true
+                                canGoForward = view?.canGoForward() == true
+                            }
+
+                            override fun shouldOverrideUrlLoading(
+                                view: WebView?,
+                                request: WebResourceRequest?,
+                            ): Boolean {
+                                val u = request?.url?.toString() ?: return false
+                                // Stay in the overlay for same-node navigation;
+                                // hand genuinely external links to the real browser.
+                                if (isSameHost(u, serverUrl)) return false
+                                openExternalUrl(ctx, u)
+                                return true
+                            }
+                        }
+
+                        browser = this
+                        loadUrl(url)
+                    }
+                },
+            )
+
+            // Centered loading screen — app favicon (or spinner) + title + bar.
+            if (loading) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .background(SurfaceBlack),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center,
+                ) {
+                    Box(
+                        modifier = Modifier.size(84.dp).clip(RoundedCornerShape(20.dp)),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        val fav = favicon
+                        if (fav != null) {
+                            Image(
+                                bitmap = fav.asImageBitmap(),
+                                contentDescription = title,
+                                modifier = Modifier.fillMaxSize(),
+                            )
+                        } else {
+                            CircularProgressIndicator(color = BitcoinOrange)
+                        }
+                    }
+                    Spacer(modifier = Modifier.height(18.dp))
+                    Text(
+                        text = title,
+                        style = MaterialTheme.typography.bodyLarge,
+                        color = TextPrimary,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    LinearProgressIndicator(
+                        progress = { progress / 100f },
+                        modifier = Modifier.width(220.dp),
+                        color = BitcoinOrange,
+                        trackColor = TextMuted.copy(alpha = 0.2f),
+                    )
+                }
+            }
+        }
+
+        // Bottom control bar — mirrors the web mobile-iframe footer.
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .height(48.dp)
-                .padding(horizontal = 4.dp),
+                .height(56.dp)
+                .background(SurfaceBlack)
+                .padding(horizontal = 8.dp),
+            horizontalArrangement = Arrangement.SpaceAround,
             verticalAlignment = Alignment.CenterVertically,
         ) {
+            IconButton(onClick = { browser?.goBack() }, enabled = canGoBack) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                    contentDescription = "Back",
+                    tint = if (canGoBack) TextPrimary else TextMuted.copy(alpha = 0.4f),
+                )
+            }
+            IconButton(onClick = { browser?.goForward() }, enabled = canGoForward) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.ArrowForward,
+                    contentDescription = "Forward",
+                    tint = if (canGoForward) TextPrimary else TextMuted.copy(alpha = 0.4f),
+                )
+            }
+            IconButton(onClick = { browser?.reload() }) {
+                Icon(
+                    imageVector = Icons.Default.Refresh,
+                    contentDescription = "Reload",
+                    tint = TextPrimary,
+                )
+            }
+            IconButton(onClick = { openExternalUrl(context, browser?.url ?: url) }) {
+                Icon(
+                    imageVector = Icons.Default.OpenInBrowser,
+                    contentDescription = stringResource(R.string.open_in_browser),
+                    tint = TextPrimary,
+                )
+            }
             IconButton(onClick = onClose) {
                 Icon(
                     imageVector = Icons.Default.Close,
@@ -473,82 +626,6 @@ private fun InAppBrowser(
                     tint = TextPrimary,
                 )
             }
-            Text(
-                text = title,
-                style = MaterialTheme.typography.bodyMedium,
-                color = TextPrimary,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier.weight(1f),
-            )
-            IconButton(onClick = { openExternalUrl(context, browser?.url ?: url) }) {
-                Icon(
-                    imageVector = Icons.Default.OpenInBrowser,
-                    contentDescription = stringResource(R.string.open_in_browser),
-                    tint = TextMuted,
-                )
-            }
         }
-
-        AnimatedVisibility(visible = loading, enter = fadeIn(), exit = fadeOut()) {
-            LinearProgressIndicator(
-                progress = { progress / 100f },
-                modifier = Modifier.fillMaxWidth(),
-                color = BitcoinOrange,
-                trackColor = SurfaceBlack,
-            )
-        }
-
-        AndroidView(
-            modifier = Modifier.fillMaxSize(),
-            factory = { ctx ->
-                WebView(ctx).apply {
-                    layoutParams = ViewGroup.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                    )
-                    isVerticalScrollBarEnabled = false
-                    isHorizontalScrollBarEnabled = false
-
-                    CookieManager.getInstance().setAcceptThirdPartyCookies(this, true)
-                    applyArchipelagoSettings()
-
-                    webChromeClient = object : WebChromeClient() {
-                        override fun onProgressChanged(view: WebView?, newProgress: Int) {
-                            progress = newProgress
-                        }
-
-                        override fun onReceivedTitle(view: WebView?, t: String?) {
-                            if (!t.isNullOrBlank()) title = t
-                        }
-                    }
-
-                    webViewClient = object : WebViewClient() {
-                        override fun onPageStarted(view: WebView?, u: String?, favicon: Bitmap?) {
-                            loading = true
-                        }
-
-                        override fun onPageFinished(view: WebView?, u: String?) {
-                            loading = false
-                        }
-
-                        override fun shouldOverrideUrlLoading(
-                            view: WebView?,
-                            request: WebResourceRequest?,
-                        ): Boolean {
-                            val u = request?.url?.toString() ?: return false
-                            // Stay in the overlay for same-node navigation;
-                            // hand genuinely external links to the real browser.
-                            if (isSameHost(u, serverUrl)) return false
-                            openExternalUrl(ctx, u)
-                            return true
-                        }
-                    }
-
-                    browser = this
-                    loadUrl(url)
-                }
-            },
-        )
     }
 }