yuanyeex
/
openclaw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: run canvas WebView loads on main

main
Peter Steinberger 2025-12-18 08:31:56 +00:00
parent c6421136f9
commit fceab511b3
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/android/app/src/main/java/com/steipete/clawdis/node/node/CanvasController.kt
View File

@ -3,6 +3,7 @@ package com.steipete.clawdis.node.node
import android.graphics.Bitmap
import android.os.Build
import android.graphics.Canvas
import android.os.Looper
import android.webkit.WebView
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.suspendCancellableCoroutine
@ -33,18 +34,30 @@ class CanvasController {
reload()
}
private fun reload() {
private inline fun withWebViewOnMain(crossinline block: (WebView) -> Unit) {
val wv = webView ?: return
when (mode) {
if (Looper.myLooper() == Looper.getMainLooper()) {
block(wv)
} else {
wv.post { block(wv) }
}
}
private fun reload() {
val currentMode = mode
val currentUrl = url
withWebViewOnMain { wv ->
when (currentMode) {
Mode.WEB -> {
// Match iOS behavior: if URL is missing/invalid, keep the current page (canvas scaffold).
val trimmed = url.trim()
if (trimmed.isBlank()) return
val trimmed = currentUrl.trim()
if (trimmed.isBlank()) return@withWebViewOnMain
wv.loadUrl(trimmed)
}
Mode.CANVAS -> wv.loadDataWithBaseURL(null, canvasHtml, "text/html", "utf-8", null)
}
}
}
suspend fun eval(javaScript: String): String =
withContext(Dispatchers.Main) {