Skip to content

Commit d1ec482

Browse files
giodl73-repogiodl73-repo
committed
Merge remote-tracking branch 'origin/main' into doctor-startup-channel-lint-findings
2 parents 84f621a + 55d31be commit d1ec482

45 files changed

Lines changed: 1028 additions & 258 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/android/CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
## Unreleased
44

5-
Maintenance update for the current OpenClaw Android release.
5+
## 2026.6.11 - 2026-07-01
6+
7+
Improves Android gateway setup with localized onboarding, QR pairing fixes, and support for local mDNS gateway hosts.
8+
9+
Adds clearer recovery guidance for TLS fingerprint timeouts, mobile protocol mismatches, and gateway auth states.
10+
11+
Refreshes native Android localization coverage, including Swedish app naming and localized gateway trust flows.
612

713
## 2026.6.2 - 2026-06-02
814

‎apps/android/Config/Version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# Source of truth: apps/android/version.json
33
# Generated by scripts/android-sync-versioning.ts.
44

5-
OPENCLAW_ANDROID_VERSION_NAME=2026.6.10
6-
OPENCLAW_ANDROID_VERSION_CODE=2026061001
5+
OPENCLAW_ANDROID_VERSION_NAME=2026.6.11
6+
OPENCLAW_ANDROID_VERSION_CODE=2026061101

‎apps/android/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Direct Gradle tasks:
116116
cd apps/android
117117
./gradlew :app:ktlintCheck :benchmark:ktlintCheck
118118
./gradlew :app:ktlintFormat :benchmark:ktlintFormat
119-
./gradlew :app:lintDebug
119+
./gradlew :app:lintPlayDebug :app:lintThirdPartyDebug
120120
```
121121

122122
`gradlew` auto-detects the Android SDK at `~/Library/Android/sdk` (macOS default) if `ANDROID_SDK_ROOT` / `ANDROID_HOME` are unset.

‎apps/android/app/src/main/java/ai/openclaw/app/GatewayExecApprovals.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ internal fun parseGatewayExecApprovalDetail(
9797
)
9898
}
9999

100-
private fun gatewayExecApprovalListCommandText(obj: JsonObject, request: JsonObject?): String =
100+
private fun gatewayExecApprovalListCommandText(
101+
obj: JsonObject,
102+
request: JsonObject?,
103+
): String =
101104
obj["commandText"]
102105
.asStringOrNull()
103106
?.trim()

‎apps/android/app/src/main/java/ai/openclaw/app/ui/OnboardingFlow.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ fun OnboardingFlow(
314314
gatewayEndpointValidationMessage(
315315
scanned.error ?: GatewayEndpointValidationError.INVALID_URL,
316316
GatewayEndpointInputSource.QR_SCAN,
317-
)
317+
)
318318
return@addOnSuccessListener
319319
}
320320
val config = resolveCurrentGatewayConfig(setupCodeValue = scannedSetupCode)

‎apps/android/app/src/main/java/ai/openclaw/app/ui/design/ClawSurfaces.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package ai.openclaw.app.ui.design
22

3-
import androidx.compose.foundation.BorderStroke
43
import androidx.compose.foundation.layout.Arrangement
54
import androidx.compose.foundation.layout.Column
65
import androidx.compose.foundation.layout.PaddingValues

apps/android/app/src/main/res/values-id/strings.xml renamed to apps/android/app/src/main/res/values-in/strings.xml

File renamed without changes.

‎apps/android/fastlane/metadata/android/en-US/release_notes.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
Maintenance update for the current OpenClaw Android release.
1+
Improves Android gateway setup with localized onboarding, QR pairing fixes, and support for local mDNS gateway hosts.
2+
3+
Adds clearer recovery guidance for TLS fingerprint timeouts, mobile protocol mismatches, and gateway auth states.
4+
5+
Refreshes native Android localization coverage, including Swedish app naming and localized gateway trust flows.

‎apps/android/version.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "2026.6.10",
3-
"versionCode": 2026061001
2+
"version": "2026.6.11",
3+
"versionCode": 2026061101
44
}

‎docs/gateway/configuration-reference.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,10 @@ conversation bindings, or any non-Codex harness.
318318
default destructive-action policy for migrated plugin app elicitations.
319319
Use `true` to accept safe Codex approval schemas without prompting, `false`
320320
to decline them, `"auto"` to route Codex-required approvals through OpenClaw
321-
plugin approvals, or `"always"` to ask for every plugin write/destructive
322-
action without durable approval. The `"always"` mode clears durable Codex
323-
per-tool approval overrides for the affected app before starting the thread.
321+
plugin approvals, or `"ask"` to prompt for every plugin write/destructive
322+
action without durable approval. The `"ask"` mode clears durable Codex
323+
per-tool approval overrides for the affected app and selects the human
324+
approvals reviewer for that app before the Codex thread starts.
324325
Default: `true`.
325326
- `plugins.entries.codex.config.codexPlugins.plugins.<key>.enabled`: enables a
326327
migrated plugin entry when global `codexPlugins.enabled` is also true.
@@ -332,7 +333,11 @@ conversation bindings, or any non-Codex harness.
332333
- `plugins.entries.codex.config.codexPlugins.plugins.<key>.allow_destructive_actions`:
333334
per-plugin destructive-action override. When omitted, the global
334335
`allow_destructive_actions` value is used. The per-plugin value accepts the
335-
same `true`, `false`, `"auto"`, or `"always"` policies.
336+
same `true`, `false`, `"auto"`, or `"ask"` policies.
337+
338+
Each admitted plugin app that uses `"ask"` routes that app's approval requests
339+
to the human reviewer. Other apps and non-app thread approvals keep their
340+
configured reviewer, so mixed plugin policies do not inherit `"ask"` behavior.
336341

337342
`codexPlugins.enabled` is the global enablement directive. Explicit plugin
338343
entries written by migration are the durable install and repair eligibility set.

0 commit comments

Comments
 (0)