fix(android): bracket IPv6 hosts in manual gateway URL composition (#99107)

ly85206559 · cursoragent · steipete · web-flow · commit 97ad0b7c211c · 2026-07-02T11:28:18.000-07:00
* fix(android): bracket IPv6 hosts in manual gateway URL composition

Reuse formatGatewayAuthority when building manual gateway URLs so IPv6
loopback and LAN hosts parse correctly during onboarding connect setup.

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;

* test(android): cover bracketed IPv6 gateway hosts

* fix(android): avoid gateway i18n inventory churn

---------

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
Co-authored-by: Peter Steinberger &lt;steipete@gmail.com&gt;
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayConfigResolver.kt
@@ -261,7 +261,7 @@ internal fun composeGatewayManualUrl(
     }
   if (port !in 1..65535) return null
   val scheme = if (tls) "https" else "http"
-  return "$scheme://$host:$port"
+  return "$scheme://${ai.openclaw.app.gateway.formatGatewayAuthority(host, port)}"
 }
 
 private fun parseJsonObject(input: String): JsonObject? = runCatching { gatewaySetupJson.parseToJsonElement(input).jsonObject }.getOrNull()
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/ui/GatewayConfigResolverTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/ui/GatewayConfigResolverTest.kt
@@ -606,6 +606,24 @@ class GatewayConfigResolverTest {
     assertNull(url)
   }
 
+  @Test
+  fun composeGatewayManualUrl_bracketsIpv6ForEndpointParsing() {
+    for (hostInput in listOf("::1", "[::1]")) {
+      val url = composeGatewayManualUrl(hostInput, "18789", tls = false)
+
+      assertEquals("http://[::1]:18789", url)
+      assertEquals(
+        GatewayEndpointConfig(
+          host = "::1",
+          port = 18789,
+          tls = false,
+          displayUrl = "http://[::1]:18789",
+        ),
+        parseGatewayEndpoint(url!!),
+      )
+    }
+  }
+
   @Test
   fun resolveGatewayConnectConfigManualAcceptsTailscaleHostWithoutPort() {
     val resolved =

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ internal fun composeGatewayManualUrl(`
`261`	`261`	`}`
`262`	`262`	`if (port !in 1..65535) return null`
`263`	`263`	`val scheme = if (tls) "https" else "http"`
`264`		`- return "$scheme://$host:$port"`
	`264`	`+ return "$scheme://${ai.openclaw.app.gateway.formatGatewayAuthority(host, port)}"`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`private fun parseJsonObject(input: String): JsonObject? = runCatching { gatewaySetupJson.parseToJsonElement(input).jsonObject }.getOrNull()`