From 11bd40fe8a0c47f43360181236d6ade25b0a4aaa Mon Sep 17 00:00:00 2001
From: Ayaan Zaidi <hi@obviy.us>
Date: Wed, 8 Apr 2026 21:08:32 +0530
Subject: [PATCH] fix(android): prefer bootstrap auth on qr pairing

---
 .../src/main/java/ai/openclaw/app/gateway/GatewaySession.kt | 2 +-
 .../ai/openclaw/app/gateway/GatewaySessionInvokeTest.kt     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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
index 8d437da5e3c..92e9eba1cee 100644
--- 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
index ed6d73ede17..e16691fb98a 100644
--- 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)
     }