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) diff --git a/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index dce2c04..11b0ae8 100644 Binary files a/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ 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 @@ + \ No newline at end of file