From 39d7e82a55bb3737f40358d24bc1cd2e09911584 Mon Sep 17 00:00:00 2001
From: LukeMackin <luke@yuzu-gca.dev>
Date: Tue, 21 Jul 2026 23:07:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20v6=E9=A1=B5checkUpdate+applyUpdate?=
 =?UTF-8?q?=E5=85=A8=E7=94=A8Bridge(=E7=A7=BB=E9=99=A4fetch+CSP=E8=AF=AF?=
 =?UTF-8?q?=E4=BC=A4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ota/h5/index-v6.html                          |  30 ++++++++----------
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../main/java/dev/yuzu/gca/MainActivity.kt    |  11 +------
 window_dump.xml                               |   1 +
 4 files changed, 16 insertions(+), 26 deletions(-)
 create mode 100644 window_dump.xml

diff --git a/ota/h5/index-v6.html b/ota/h5/index-v6.html
index b0ed625..ce1990e 100644
--- a/ota/h5/index-v6.html
+++ b/ota/h5/index-v6.html
@@ -45,11 +45,12 @@ function selectCh(el,ch){
 }
 function log(m){document.getElementById('log').innerText+=m+'\n'}
 function checkUpdate(){
- var manFile='/h5/manifest-'+channel+'.json';
- log('checking '+manFile+' ...');
- fetch(BASE+manFile+'?t='+Date.now(),{cache:'no-store'})
- .then(function(r){if(!r.ok)throw Error('HTTP '+r.status);return r.json()})
- .then(function(j){log('latest: '+j.latest+' min: '+j.min_version);
+ log('manifest via Bridge ...');
+ var resp=Android.fetchManifest(channel);
+ try{
+  var j=JSON.parse(resp);
+  if(j.error){log('ERR: '+j.error);return}
+  log('latest: '+j.latest+' min: '+j.min_version);
   if(j.min_version){
    var v=j.min_version.replace(/[^0-9]/g,''),my=document.getElementById('ver').textContent.replace(/[^0-9]/g,'');
    if(parseInt(my)<parseInt(v)){log('ERR: too old, need APK update');return}
@@ -60,18 +61,15 @@ function checkUpdate(){
   var myVer=document.getElementById('ver').textContent;
   if(j.latest!==myVer&&j.latest!=='v'+myVer&&'v'+j.latest!==myVer){dlVer=j.latest;
    log('*** NEW VERSION ***');document.getElementById('btnApply').disabled=false}
-  else log('up to date')})
- .catch(function(e){log('ERR: '+e.message)})
+  else log('up to date')
+ }catch(e){log('ERR: '+e.message)}
 }
 function applyUpdate(){
- fetch(dlUrl+'?t='+Date.now(),{cache:'no-store'})
- .then(function(r){if(!r.ok)throw Error('HTTP '+r.status);return r.text()})
- .then(function(t){
-  if(!dlSha){log('ERR: SHA256 required');return}
-  var h=Android.sha256(t);
-  if(h!==dlSha){log('SHA256 MISMATCH!');return}
-  Android.saveCache(t);log('OK! restart app to apply')
- })
- .catch(function(e){log('ERR: '+e.message)})
+ var t=Android.fetchText(('h5/index-'+dlVer).replace('0.1.0-dav-android-','v')+'.html');
+ if(typeof t!=='string'||t.startsWith('ERROR:')){log('ERR: '+t);return}
+ if(!dlSha||dlSha.startsWith('TBD')){log('ERR: SHA256 required');return}
+ var h=Android.sha256(t);
+ if(h!==dlSha){log('SHA256 MISMATCH!');return}
+ Android.saveCache(t);log('OK! restart app to apply')
 }
 </script></body></html>
diff --git a/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index dce2c044ac4a9ddf71cc0978390f9d6e11a40b25..11b0ae87bba366b91b2c5a192966f0947c729246 100644
GIT binary patch
literal 17
UcmZQ>(-v{$|HmrA00t}#034bEv;Y7A

literal 17
UcmZQ>(-v{$|HmrA00u1f032BYa{vGU

diff --git a/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt b/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt
index 419eabe..0497ab4 100644
--- a/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt
+++ b/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt
@@ -24,16 +24,7 @@ class MainActivity : AppCompatActivity() {
             settings.domStorageEnabled = true
             settings.allowFileAccess = true
             addJavascriptInterface(Bridge(this@MainActivity), "Android")
-            webViewClient = object : WebViewClient() {
-                override fun onPageFinished(view: WebView, url: String) {
-                    view.evaluateJavascript("""
-                        var meta = document.createElement('meta');
-                        meta.httpEquiv = 'Content-Security-Policy';
-                        meta.content = "default-src 'none'; script-src 'unsafe-inline'; connect-src 'none'";
-                        document.head.appendChild(meta);
-                    """.trimIndent(), null)
-                }
-            }
+            webViewClient = object : WebViewClient() {}
 
             if (cacheFile.exists()) {
                 val html = cacheFile.readText()
diff --git a/window_dump.xml b/window_dump.xml
new file mode 100644
index 0000000..94c7eea
--- /dev/null
+++ b/window_dump.xml
@@ -0,0 +1 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><hierarchy rotation="0"><node index="0" text="" resource-id="" class="android.widget.FrameLayout" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][1220,2712]"><node index="0" text="" resource-id="" class="android.widget.LinearLayout" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][1220,2664]"><node index="0" text="" resource-id="" class="android.widget.FrameLayout" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,104][1220,2664]"><node index="0" text="" resource-id="dev.yuzu.gca:id/decor_content_parent" class="android.view.ViewGroup" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,104][1220,2664]"><node index="1" text="" resource-id="dev.yuzu.gca:id/action_bar_container" class="android.widget.FrameLayout" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,104][1220,272]"><node index="0" text="" resource-id="dev.yuzu.gca:id/action_bar" class="android.view.ViewGroup" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,104][1220,272]"><node index="0" text="Yuzu GCA v0.1.0" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[48,148][502,228]" /></node></node><node index="2" text="" resource-id="android:id/content" class="android.widget.FrameLayout" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,272][1220,2664]"><node index="0" text="" resource-id="" class="android.webkit.WebView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,272][1220,2664]"><node index="0" text="" resource-id="" class="android.webkit.WebView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="true" focused="true" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,272][1220,2664]"><node index="0" text="" resource-id="" class="android.view.View" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,272][1220,530]"><node index="0" text="Yuzu GCA v6" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[48,332][1173,407]" /><node index="1" text="热更新 v6 — 渠道选择器" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[48,416][1173,470]" /></node><node index="1" text="更新渠道" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[99,617][1122,680]" /><node index="2" text="Stable" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[99,701][426,815]" /><node index="3" text="Beta" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[447,701][774,815]" /><node index="4" text="Nightly" resource-id="" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[795,701][1122,815]" /><node index="5" text="检查更新" resource-id="" class="android.widget.Button" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[48,911][1173,1061]" /><node index="6" text="下载更新" resource-id="btnApply" class="android.widget.Button" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="true" enabled="false" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[48,1085][1173,1235]" /><node index="7" text="" resource-id="log" class="android.widget.TextView" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[48,1268][1173,1343]" /></node></node></node></node></node></node><node index="1" text="" resource-id="android:id/statusBarBackground" class="android.view.View" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][1220,104]" /><node index="2" text="" resource-id="android:id/navigationBarBackground" class="android.view.View" package="dev.yuzu.gca" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,2664][1220,2712]" /></node></hierarchy>
\ No newline at end of file