Merge pull request #2 from Moukrea/hotfix/betterxcloud-not-loading

Resolve #1 - Better xCloud not loading
moukrea · Apr 15, 2024 · 05858d3 · 05858d3
2 parents d29cb6e + 08c5dad
commit 05858d3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/android/.idea/vcs.xml b/android/.idea/vcs.xml
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 24
         targetSdk 34
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/android/app/src/main/java/com/moukrea/gamepassplus/MainActivity.java b/android/app/src/main/java/com/moukrea/gamepassplus/MainActivity.java
@@ -266,7 +266,7 @@ private String fetchLatestVersion() {
         }
         return null; // Default or error handling
     }
-    
+
     /**
      * Loads Game Pass into WebView
      * Injects custom scripts and Better xCloud
@@ -321,7 +321,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
             @Override
             public void onPageStarted(WebView view, String url, Bitmap favicon) {
                 super.onPageStarted(view, url, favicon);
-                if (MainActivity.this.useBetterXcloud) { // Use the class field here
+                if (MainActivity.this.useBetterXcloud) {
                     injectScript(view);
                 }
             }
@@ -481,16 +481,19 @@ private void injectScript(WebView webView) {
             File scriptFile = new File(getFilesDir(), "better-xcloud.user.js");
             InputStream inputStream = new FileInputStream(scriptFile);
             byte[] buffer = new byte[inputStream.available()];
+            inputStream.read(buffer);
             inputStream.close();
             String encoded = Base64.encodeToString(buffer, Base64.NO_WRAP);
 
-            // JavaScript to ensure the script runs as early as possible
             String script = "if (document.readyState === 'loading') {" +
                     "var script = document.createElement('script');" +
                     "script.type = 'text/javascript';" +
                     // Decode and set the script content
                     "script.text = decodeURIComponent(escape(window.atob('" + encoded + "')));" +
                     "document.documentElement.appendChild(script);" +
+                    "} else {" +
+                    // If the page is not in 'loading', force a reload
+                    "window.location.reload();" +
                     "}";
             webView.evaluateJavascript(script, null);
         } catch (Exception e) {