a lot of stuff. Mostly UX

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/index.html

@@ -124,8 +124,8 @@ <h2>Cosmetics type</h2>
             <div class="contentItem hidden" id="getMods">
                 <h2>You can download mods and cosmetics from the following sites. Only QMods are supported by QuestAppVersionSwitcher + any cosmetics formats of the currently selected game</h2>
                 <div style="display: flex; flex-direction: column;" class="buttonsContainer">
-                    <div class="button labelMargin" onclick="OpenSite(`https://computerelite.github.io/tools/Beat_Saber/questmods.html?version=${currentGameVersion}&isqavs=true`)">Open Beat Saber Mods page</div>
-                    <div class="button labelMargin" onclick="OpenSite(`https://computerelite.github.io/tools/Oculus/QAVSHome.html?version=${currentGameVersion}&isqavs=true`)">Open website hub</div>
+                    <div class="button labelMargin" onclick="OpenSite(`https://computerelite.github.io/tools/Beat_Saber/questmods.html?version=${currentGameVersion}&isqavs=true&port=${GetPort()}&ismodded=${isGamePatched}`)">Open Beat Saber Mods page</div>
+                    <div class="button labelMargin" onclick="OpenSite(`https://computerelite.github.io/tools/Oculus/QAVSHome.html?version=${currentGameVersion}&isqavs=true&port=${GetPort()}&ismodded=${isGamePatched}`)">Open website hub</div>
                     <div class="button labelMargin" onclick="OpenSite(`https://www.google.com/search?q=computerelite`)">Open Google</div>
                 </div>
             </div>
@@ -296,9 +296,10 @@ <h2>Downloads</h2>
                 <div class="contentHeader headerMargin">
                     Password needed
                 </div>
-                Please enter the password you set when you logged in. If you didn't set one or forgot your password abort the download and head to the <code>Tools & Options</code> section to log in again.
+                Please enter the password you set when you logged in.
                 <br>
-                Check the <code>download progress</code> section to see if the download was successful.
+                <br>
+                <i>If you didn't set one or forgot your password abort the download and head to the <code>Tools & Options</code> section to log in again.</i>
                 <input type="password" id="passwordConfirm" placeholder="password">
                 <div id="step7box" class="textBox"></div>
                 <div class="buttonSelectionContainer">
@@ -373,6 +374,24 @@ <h2>Downloads</h2>
                     </div>
                 </div>
             </div>
+
+            <div id="step13" class="restoreStep hidden">
+                <div class="contentHeader headerMargin">
+                    Login
+                </div>
+                To downgrade your game you need to log into QuestAppVersionSwitcher with your Meta account. This is needed so you can download the old version of the game.
+                <br>
+                To downgrade press the login button below and login with your Meta account.
+                <div id="step13box" class="textBox"></div>
+                <div class="buttonSelectionContainer">
+                    <div class="buttonContainer">
+                        <div class="button" id="login2">Login</div>
+                    </div>
+                    <div class="buttonContainer buttonMargin">
+                        <div class="button" id="cancellogin2">Abort downgrade</div>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <div class="listContainer darken hidden" id="deleteContainer">

QuestAppVersionSwitcher/Assets/html/qavs_inject.js

@@ -0,0 +1,54 @@
+var qavsInjectionDiv = document.createElement("div");
+document.body.appendChild(qavsInjectionDiv);
+const qavsPort = "{0}"
+
+// Create nav bar
+var qavsNavbar = document.createElement("div");
+qavsNavbar.style = "color: #EEEEEE; position: fixed; top: 10px; right: 10px; background-color: #414141; border-radius: 5px; padding: 5px; display: flex; z-index: 50000;";
+qavsNavbar.innerHTML += `
+<div style="border-radius: 5px; font-size: 100%; background-color: #5B5B5B; width: fit-content; height: fit-content; padding: 5px; cursor: pointer; flex-shrink: 0; user-select: none; margin-right: 5px;" onclick="history.go(-1)">Back</div>
+<div style="border-radius: 5px; font-size: 100%; background-color: #5B5B5B; width: fit-content; height: fit-content; padding: 5px; cursor: pointer; flex-shrink: 0; user-select: none; margin-right: 5px;" onclick="history.go(1)">Forward</div>
+<div style="border-radius: 5px; font-size: 100%; background-color: #5B5B5B; width: fit-content; height: fit-content; padding: 5px; cursor: pointer; flex-shrink: 0; user-select: none; margin-right: 5px;" onclick="location = 'http://localhost:${qavsPort}'">QuestAppVersionSwitcher</div>
+<div style="border-radius: 5px; font-size: 100%; background-color: #5B5B5B; width: fit-content; height: fit-content; padding: 5px; cursor: pointer; flex-shrink: 0; user-select: none;" onclick="location = 'https://oculus.com/experiences/quest'">Oculus (Login)</div>`;
+qavsInjectionDiv.appendChild(qavsNavbar)
+
+// Handle popups
+var qavsPopupContainer = document.createElement("div");
+qavsPopupContainer.style = "font-size: 24px; border: 1px solid #4aaf8b; position: fixed; bottom: 10px; right: 10px; z-index: 50000; padding: 10px; border-radius: 5px; background-color: #414141; color: #EEEEEE; display: none;"
+qavsInjectionDiv.appendChild(qavsPopupContainer);
+
+const ModInstall = 0
+const DependencyDownload = 4
+const ModDownload = 7
+const QueuedModInstall = 8
+const Error = 6
+
+var somethingWasRunning = false;
+function UpdatePopUps() {
+    fetch("http://localhost:" + qavsPort + "/api/mods/operations").then(res => {
+        res.json().then(operations => {
+            operations = operations.filter(x => !x.isDone);
+            var queuedMods = operations.filter(x => x.type == QueuedModInstall);
+            var installingMods = operations.filter(x => x.type == ModInstall);
+            var downloadingMods = operations.filter(x => x.type == ModDownload);
+            var downloadingDependencies = operations.filter(x => x.type == DependencyDownload);
+            var errors = operations.filter(x => x.type == Error);
+            
+            var html = `
+                ${queuedMods.length > 0 ? `${queuedMods.length} mods queued<br>` : ``}
+                ${installingMods.length > 0 ? `${installingMods.length} mods installing<br>` : ``}
+                ${downloadingMods.length > 0 ? `${downloadingMods.length} mods downloading<br>` : ``}
+                ${downloadingDependencies.length > 0 ? `${downloadingDependencies.length} dependencies downloading<br>` : ``}
+                ${errors.length > 0 ? `${errors.length} errors, more info in installed mods tab<br>` : ``}
+            `;
+            if(!html) {
+                html = "All done!"
+            } else {
+                somethingWasRunning = true
+            }
+            qavsPopupContainer.innerHTML = html;
+            qavsPopupContainer.style.display = somethingWasRunning ? "block" : "none";
+        })
+    })
+}
+setInterval(UpdatePopUps, 300);

QuestAppVersionSwitcher/Assets/html/script.js

@@ -21,6 +21,14 @@ function IsOnQuest() {
     return location.host.startsWith("127.0.0.1") ||location.host.startsWith("localhost")
 }
 
+function GetPort() {
+    return location.port
+}
+
+document.getElementById("cancellogin2").onclick = () => {
+    CloseGetPasswordPopup()
+}
+
 fetch("/api/android/device").then(res => res.json().then(res => {
     if(res.sdkVersion <= 29) {
         // Android 10 and below don't need new storage perms
@@ -174,7 +182,7 @@ function UpdateVersion(version) {
 
 var isGamePatched = false
 const patchingOptions = document.getElementById("patchingOptions")
-
+var patchingStatus = {}
 function UpdatePatchingStatus() {
     if(patchInProgress) {
         return;
@@ -183,6 +191,7 @@ function UpdatePatchingStatus() {
     fetch("/api/patching/getmodstatus").then(res => {
         res.json().then(res => {
             UpdateVersion(res.version)
+            patchingStatus = res
             isGamePatched = res.isPatched
             if (res.isPatched) {
                 document.getElementById("modsButton").style.display = "block"
@@ -448,6 +457,38 @@ UpdateUI()
 TokenUIUpdate()
 const oculusLink = "https://auth.meta.com/"
 const params = new URLSearchParams(window.location.search)
+
+function CheckStartParams() {
+    var download = params.get("download")
+    var game = params.get("game")
+    var version = params.get("version")
+    var package = params.get("package")
+    var modnow = params.get("modnow")
+    if(download) {
+        fetch("/api/questappversionswitcher/loggedinstatus").then(res => {
+            res.json().then(res => {
+                if(res.msg == "2") {
+                    // Logged in
+                    // Open downgrade tab
+                    OpenTab("downgrade")
+                    // Open OculusDB on correct page
+                    document.getElementById("downgradeframe").src = `https://oculusdb.rui2015.me/id/${game}?downloadversion=${version}`
+                } else {
+                    // Not logged in
+                    OpenGetPasswordPopup()
+                    GotoStep(13)
+                }
+            })
+        })
+    }
+
+    if(modnow) {
+        ChangeApp(package)
+        OpenTab("patching")
+        PatchGame()
+    }
+}
+
 var config = {}
 var selectedBackup = ""
 
@@ -480,6 +521,7 @@ function UpdateUI(closeLists = false) {
         if(firstConfigFetch) {
             firstConfigFetch = false;
             CheckFolderPermission();
+            CheckStartParams()
         }
         Array.prototype.forEach.call(document.getElementsByClassName("packageName"), e => {
             if(config.currentApp) e.innerHTML = config.currentApp
@@ -561,7 +603,7 @@ function FormatDownload(d) {
                     </div>
                     ${d.isCancelable ? `<input type="button" class="DownloadText" value="Cancel" onclick="StopDownload('${d.backupName}')">` : ``}
                     <div class="DownloadText" style="color: ${d.textColor};">
-                        ${d.text} ${d.percentageString} ${d.doneString} / ${d.totalString} ${d.speedString} ETA ${d.eTAString}
+                        <b>${d.text}</b> ${d.percentageString} ${d.doneString} / ${d.totalString} ${d.speedString} ETA ${d.eTAString}
                     </div>
                 </div>`
 }
@@ -580,7 +622,7 @@ setInterval(() => {
                     downloads += FormatDownload(download)
                 }
                 gdms += `<div style="display: flex; flex-direction: column; background-color: #1F1F1F; padding: 10px;"><div class="downloadContainer">
-                     ${!d.done ? `<input type="button" class="DownloadText" style="width: 0px; background-color: #333333" value="Cancel" onclick="StopGameDownload('${d.id}')">` : ``}
+                     ${!d.done ? (d.canceled || d.error ? `` : `<input type="button" class="DownloadText" style="width: 200px; background-color: #333333; font-size: 1.2em;" value="Cancel" onclick="StopGameDownload('${d.id}')">`) : `<input type="button" class="DownloadText" style="width: 200px; background-color: #333333; color: #00FF00; font-size: 1.2em;" value="Install Version" onclick="RestoreBackup('${d.backupName}', '${d.packageName}')">`}
                     <div class="DownloadText" style="color: ${d.textColor};">
                         <b>${d.canceled ? "Cancelled " : ""}${d.status}</b><br>${d.filesDownloaded} / ${d.filesToDownload} files downloaded
                     </div>
@@ -682,13 +724,15 @@ setInterval(() => {
     })
 }, 500)
 
+if(localStorage.lastOpened) OpenTab(localStorage.lastOpened)
 function OpenTab(section) {
     Array.prototype.forEach.call(document.getElementsByClassName("menuItem"), e => {
         e.className = "menuItem" + (e.getAttribute("section") == section ? " selected" : "")
     })
     Array.prototype.forEach.call(document.getElementsByClassName("contentItem"), e => {
         e.className = "contentItem" + (e.id == section ? "" : " hidden")
     })
+    localStorage.lastOpened = section
 }
 
 
@@ -775,7 +819,7 @@ document.getElementById("uninstall2").onclick = () => {
     fetch(`/api/backupinfo?package=${config.currentApp}&backupname=${selectedBackup}`).then(res => {
         res.json().then(j => {
             if(!j.containsApk) {
-                GotoStep("4.1")
+                AfterAPKInstall()
             } else {
                 fetch(`/api/android/uninstallpackage?package=${config.currentApp}`, {method: "POST"}).then(res => {
                     if (res.status == 230) GotoStep(3)
@@ -805,29 +849,33 @@ document.getElementById("install").onclick = () => {
     }).then(res => {
         res.json().then(j => {
             if (res.status == 200) {
-                fetch("/api/gotaccess?package=" + config.currentApp).then(res => {
+                AfterAPKInstall()
+            }
+            else TextBoxError("step4.1box", j.msg)
+        })
+    })
+}
+
+function AfterAPKInstall() {
+    fetch("/api/gotaccess?package=" + config.currentApp).then(res => {
+        res.json().then(j => {
+            if (j.gotAccess) {
+                fetch("/api/backupinfo?package=" + config.currentApp + "&backupname=" + selectedBackup).then(res => {
                     res.json().then(j => {
-                        if (j.gotAccess) {
-                            fetch("/api/backupinfo?package=" + config.currentApp + "&backupname=" + selectedBackup).then(res => {
-                                res.json().then(j => {
-                                    if(j.isPatchedApk) {
-                                        GotoStep("4.2")
-                                    } else {
-                                        if (j.containsAppData || j.containsObbs) {
-                                            GotoStep(4)
-                                        } else {
-                                            GotoStep(5)
-                                        }
-                                    }
-                                })
-                            })
+                        if(j.isPatchedApk) {
+                            GotoStep("4.2")
                         } else {
-                            GotoStep("4.1")
+                            if (j.containsAppData || j.containsObbs) {
+                                GotoStep(4)
+                            } else {
+                                GotoStep(5)
+                            }
                         }
                     })
                 })
+            } else {
+                GotoStep("4.1")
             }
-            else TextBoxError("step4.1box", j.msg)
         })
     })
 }
@@ -1070,6 +1118,20 @@ document.getElementById("abortPassword").onclick = () => {
     document.getElementById("confirmPassword").style.display = "block"
     CloseGetPasswordPopup()
 }
+
+function RestoreBackup(backupName, game) {
+    if(game && config.currentApp != game) {
+        ChangeApp(game)
+        setTimeout(() => RestoreBackupFromSelectedGame(backupName), 200)
+        return;
+    }
+    RestoreBackupFromSelectedGame(backupName)
+}
+
+function RestoreBackupFromSelectedGame(backupName) {
+    selectedBackup = backupName;
+    OpenRestorePopup();
+}
 function PasswordInput() {
     TextBoxText("step7box", "Waiting for response and requesting obbs to download from Oculus. This may take 30 seconds...")
     options.password = encodeURIComponent(document.getElementById("passwordConfirm").value)
@@ -1085,6 +1147,7 @@ function PasswordInput() {
                 TextBoxGood("step7box", j.msg)
                 document.getElementById("abortPassword").innerHTML = "Close Popup"
                 document.getElementById("confirmPassword").style.display = "none"
+                OpenTab("download")
             }
         })
     })
@@ -1118,6 +1181,13 @@ document.getElementById("confirmLogin").onclick = () => {
     TextBoxGood("step9box", "One sec...")
     location = oculusLink
 }
+document.getElementById("login2").onclick = () => {
+    TextBoxGood("step13box", "One sec...")
+    location = oculusLink
+}
+document.getElementById("abortLogin").onclick = () => {
+    CloseGetPasswordPopup()
+}
 
 document.getElementById("tokenPassword").onclick = () => {
     options.password = encodeURIComponent(document.getElementById("passwordConfirm").value)

QuestAppVersionSwitcher/Assets/html/style.css

@@ -247,6 +247,13 @@
 
 /* Loader end */
 
+.browser {
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    left: 0;
+    top: 0;
+}
 
 body {
     margin: 0px;

QuestAppVersionSwitcher/ClientModels.cs

@@ -48,7 +48,8 @@ public class About
     public enum BackupInfoVersion
     {
         V1,
-        V2
+        V2,
+        V3
     }
 
     public class BackupList

QuestAppVersionSwitcher/DownloadListener.cs

@@ -16,7 +16,6 @@ public class DownloadListener : Java.Lang.Object, IDownloadListener
         public void OnDownloadStart(string url, string userAgent, string contentDisposition, string mimetype, long contentLength)
 		{
 			Logger.Log("Downloading mod from " + url);
-			CoreService.browser.EvaluateJavascript("ShowToast('Downloading', '#FFFFFF', '#222222')", null);
             QAVSModManager.InstallModFromUrl(url);
         }
     }

QuestAppVersionSwitcher/DownloadManager.cs

@@ -17,6 +17,7 @@ public class DownloadManager : DownloadProgress
     {
         public delegate void DownloadFinished(DownloadManager manager);
         public event DownloadFinished DownloadFinishedEvent;
+        public event DownloadFinished DownloadErrorEvent;
         public event DownloadFinished DownloadCanceled;
         public string tmpPath = "";
         public bool isObb = false;
@@ -98,6 +99,7 @@ public void StartDownload(string binaryid, string password, string version, stri
                     SetEmpty();
                     this.backupName = "Unknown Error: Have you entered your token in the Tools & Options section? Doing this is needed. Otherwise you don't own the game you are trying to download.";
                     this.textColor = "#EE0000";
+                    if(DownloadErrorEvent != null) DownloadErrorEvent(this);
                 }
                 else
                 {