fix(android): prefer bootstrap auth on qr pairing

obviyus · obviyus · commit 11bd40fe8a0c · 2026-04-08T21:58:56.000+05:30
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewaySession.kt b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewaySession.kt
@@ -886,7 +886,7 @@ class GatewaySession(
       explicitGatewayToken
         ?: if (
           explicitPassword == null &&
-            (explicitBootstrapToken == null || storedToken != null)
+            explicitBootstrapToken == null
         ) {
           storedToken
         } else {
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/gateway/GatewaySessionInvokeTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/gateway/GatewaySessionInvokeTest.kt
@@ -111,7 +111,7 @@ class GatewaySessionInvokeTest {
   }
 
   @Test
-  fun connect_prefersStoredDeviceTokenOverBootstrapToken() = runBlocking {
+  fun connect_prefersBootstrapTokenOverStoredDeviceToken() = runBlocking {
     val json = testJson()
     val connected = CompletableDeferred<Unit>()
     val connectAuth = CompletableDeferred<JsonObject?>()
@@ -148,8 +148,8 @@ class GatewaySessionInvokeTest {
       awaitConnectedOrThrow(connected, lastDisconnect, server)
 
       val auth = withTimeout(TEST_TIMEOUT_MS) { connectAuth.await() }
-      assertEquals("device-token", auth?.get("token")?.jsonPrimitive?.content)
-      assertNull(auth?.get("bootstrapToken"))
+      assertEquals("bootstrap-token", auth?.get("bootstrapToken")?.jsonPrimitive?.content)
+      assertNull(auth?.get("token"))
     } finally {
       shutdownHarness(harness, server)
     }
