diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt index 9ca0ad3f47f..603902b1907 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/ui/ConnectTabScreen.kt @@ -1,7 +1,7 @@ package ai.openclaw.app.ui -import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.BorderStroke +import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -20,6 +20,7 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Cloud +import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.material.icons.filled.ExpandLess import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Link @@ -49,6 +50,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import ai.openclaw.app.MainViewModel import ai.openclaw.app.ui.mobileCardSurface @@ -60,6 +62,7 @@ private enum class ConnectInputMode { @Composable fun ConnectTabScreen(viewModel: MainViewModel) { + val context = LocalContext.current val statusText by viewModel.statusText.collectAsState() val isConnected by viewModel.isConnected.collectAsState() val remoteAddress by viewModel.remoteAddress.collectAsState() @@ -134,7 +137,8 @@ fun ConnectTabScreen(viewModel: MainViewModel) { } } - val primaryLabel = if (isConnected) "Disconnect Gateway" else "Connect Gateway" + val showDiagnostics = !isConnected && gatewayStatusHasDiagnostics(statusText) + val statusLabel = gatewayStatusForDisplay(statusText) Column( modifier = Modifier.verticalScroll(rememberScrollState()).padding(horizontal = 20.dp, vertical = 16.dp), @@ -279,6 +283,46 @@ fun ConnectTabScreen(viewModel: MainViewModel) { } } + if (showDiagnostics) { + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(14.dp), + color = mobileWarningSoft, + border = BorderStroke(1.dp, mobileWarning.copy(alpha = 0.25f)), + ) { + Column( + modifier = Modifier.fillMaxWidth().padding(horizontal = 14.dp, vertical = 14.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), + ) { + Text("Last gateway error", style = mobileHeadline, color = mobileWarning) + Text(statusLabel, style = mobileBody.copy(fontFamily = FontFamily.Monospace), color = mobileText) + Text("OpenClaw Android ${openClawAndroidVersionLabel()}", style = mobileCaption1, color = mobileTextSecondary) + Button( + onClick = { + copyGatewayDiagnosticsReport( + context = context, + screen = "connect tab", + gatewayAddress = activeEndpoint, + statusText = statusLabel, + ) + }, + modifier = Modifier.fillMaxWidth().height(46.dp), + shape = RoundedCornerShape(12.dp), + colors = + ButtonDefaults.buttonColors( + containerColor = mobileCardSurface, + contentColor = mobileWarning, + ), + border = BorderStroke(1.dp, mobileWarning.copy(alpha = 0.3f)), + ) { + Icon(Icons.Default.ContentCopy, contentDescription = null, modifier = Modifier.size(18.dp)) + Spacer(modifier = Modifier.width(8.dp)) + Text("Copy Report for Claw", style = mobileCallout.copy(fontWeight = FontWeight.Bold)) + } + } + } + } + Surface( modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(14.dp), diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayDiagnostics.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayDiagnostics.kt new file mode 100644 index 00000000000..90737e51bc1 --- /dev/null +++ b/apps/android/app/src/main/java/ai/openclaw/app/ui/GatewayDiagnostics.kt @@ -0,0 +1,77 @@ +package ai.openclaw.app.ui + +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.os.Build +import android.widget.Toast +import ai.openclaw.app.BuildConfig + +internal fun openClawAndroidVersionLabel(): String { + val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" } + return if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) { + "$versionName-dev" + } else { + versionName + } +} + +internal fun gatewayStatusForDisplay(statusText: String): String { + return statusText.trim().ifEmpty { "Offline" } +} + +internal fun gatewayStatusHasDiagnostics(statusText: String): Boolean { + val lower = gatewayStatusForDisplay(statusText).lowercase() + return lower != "offline" && !lower.contains("connecting") +} + +internal fun gatewayStatusLooksLikePairing(statusText: String): Boolean { + val lower = gatewayStatusForDisplay(statusText).lowercase() + return lower.contains("pair") || lower.contains("approve") +} + +internal fun buildGatewayDiagnosticsReport( + screen: String, + gatewayAddress: String, + statusText: String, +): String { + val device = + listOfNotNull(Build.MANUFACTURER, Build.MODEL) + .joinToString(" ") + .trim() + .ifEmpty { "Android" } + val androidVersion = Build.VERSION.RELEASE?.trim().orEmpty().ifEmpty { Build.VERSION.SDK_INT.toString() } + val endpoint = gatewayAddress.trim().ifEmpty { "unknown" } + val status = gatewayStatusForDisplay(statusText) + return """ + Help diagnose this OpenClaw Android gateway connection failure. + + Please: + - pick one route only: same machine, same LAN, Tailscale, or public URL + - classify this as pairing/auth, TLS trust, wrong advertised route, wrong address/port, or gateway down + - quote the exact app status/error below + - tell me whether `openclaw devices list` should show a pending pairing request + - if more signal is needed, ask for `openclaw qr --json`, `openclaw devices list`, and `openclaw nodes status` + - give the next exact command or tap + + Debug info: + - screen: $screen + - app version: ${openClawAndroidVersionLabel()} + - device: $device + - android: $androidVersion (SDK ${Build.VERSION.SDK_INT}) + - gateway address: $endpoint + - status/error: $status + """.trimIndent() +} + +internal fun copyGatewayDiagnosticsReport( + context: Context, + screen: String, + gatewayAddress: String, + statusText: String, +) { + val clipboard = context.getSystemService(ClipboardManager::class.java) ?: return + val report = buildGatewayDiagnosticsReport(screen = screen, gatewayAddress = gatewayAddress, statusText = statusText) + clipboard.setPrimaryClip(ClipData.newPlainText("OpenClaw gateway diagnostics", report)) + Toast.makeText(context, "Copied gateway diagnostics", Toast.LENGTH_SHORT).show() +} diff --git a/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt b/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt index e51157297f1..1f4774a537d 100644 --- a/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt +++ b/apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt @@ -9,6 +9,7 @@ import android.hardware.SensorManager import android.net.Uri import android.os.Build import android.provider.Settings +import androidx.compose.foundation.BorderStroke import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.AnimatedVisibility @@ -60,6 +61,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ChatBubble import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.Cloud +import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.material.icons.filled.ExpandLess import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Link @@ -1519,6 +1521,12 @@ private fun FinalStep( enabledPermissions: String, methodLabel: String, ) { + val context = androidx.compose.ui.platform.LocalContext.current + val gatewayAddress = parsedGateway?.displayUrl ?: "Invalid gateway URL" + val statusLabel = gatewayStatusForDisplay(statusText) + val showDiagnostics = gatewayStatusHasDiagnostics(statusText) + val pairingRequired = gatewayStatusLooksLikePairing(statusText) + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { Text("Review", style = onboardingTitle1Style, color = onboardingText) @@ -1531,7 +1539,7 @@ private fun FinalStep( SummaryCard( icon = Icons.Default.Cloud, label = "Gateway", - value = parsedGateway?.displayUrl ?: "Invalid gateway URL", + value = gatewayAddress, accentColor = Color(0xFF7C5AC7), ) SummaryCard( @@ -1615,7 +1623,7 @@ private fun FinalStep( modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(14.dp), color = onboardingWarningSoft, - border = androidx.compose.foundation.BorderStroke(1.dp, onboardingWarning.copy(alpha = 0.2f)), + border = BorderStroke(1.dp, onboardingWarning.copy(alpha = 0.2f)), ) { Column( modifier = Modifier.padding(14.dp), @@ -1640,13 +1648,66 @@ private fun FinalStep( ) } Column(verticalArrangement = Arrangement.spacedBy(2.dp)) { - Text("Pairing Required", style = onboardingHeadlineStyle, color = onboardingWarning) - Text("Run these on your gateway host:", style = onboardingCalloutStyle, color = onboardingTextSecondary) + Text( + if (pairingRequired) "Pairing Required" else "Connection Failed", + style = onboardingHeadlineStyle, + color = onboardingWarning, + ) + Text( + if (pairingRequired) { + "Approve this phone on the gateway host, or copy the report below." + } else { + "Copy this report and give it to your Claw." + }, + style = onboardingCalloutStyle, + color = onboardingTextSecondary, + ) } } - CommandBlock("openclaw devices list") - CommandBlock("openclaw devices approve ") - Text("Then tap Connect again.", style = onboardingCalloutStyle, color = onboardingTextSecondary) + if (showDiagnostics) { + Text("Error", style = onboardingCaption1Style.copy(fontWeight = FontWeight.Bold), color = onboardingTextSecondary) + Surface( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + color = onboardingCommandBg, + border = BorderStroke(1.dp, onboardingCommandBorder), + ) { + Text( + statusLabel, + modifier = Modifier.padding(horizontal = 14.dp, vertical = 12.dp), + style = onboardingCalloutStyle.copy(fontFamily = FontFamily.Monospace), + color = onboardingCommandText, + ) + } + Text( + "OpenClaw Android ${openClawAndroidVersionLabel()}", + style = onboardingCaption1Style, + color = onboardingTextSecondary, + ) + Button( + onClick = { + copyGatewayDiagnosticsReport( + context = context, + screen = "onboarding final check", + gatewayAddress = gatewayAddress, + statusText = statusLabel, + ) + }, + modifier = Modifier.fillMaxWidth().height(48.dp), + shape = RoundedCornerShape(12.dp), + colors = ButtonDefaults.buttonColors(containerColor = onboardingSurface, contentColor = onboardingWarning), + border = BorderStroke(1.dp, onboardingWarning.copy(alpha = 0.3f)), + ) { + Icon(Icons.Default.ContentCopy, contentDescription = null, modifier = Modifier.size(18.dp)) + Spacer(modifier = Modifier.width(8.dp)) + Text("Copy Report for Claw", style = onboardingCalloutStyle.copy(fontWeight = FontWeight.Bold)) + } + } + if (pairingRequired) { + CommandBlock("openclaw devices list") + CommandBlock("openclaw devices approve ") + Text("Then tap Connect again.", style = onboardingCalloutStyle, color = onboardingTextSecondary) + } } } }