move links to top of tools & options, add uninstall beat saber button

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/index.html

@@ -190,6 +190,13 @@ <h2>Downloads</h2>
                 </div>
             </div>
             <div class="contentItem hidden" id="tools">
+                <div class="about">
+                    Quest App Version Switcher version <b id="version"></b>
+                    Accessible via browser at:
+                    <div id="ips">
+
+                    </div>
+                </div>
                 <div class="contentHeader">
                     Tools
                     <div class="contentHeaderDescription">Useful for troubleshooting and managing your install</div>
@@ -222,6 +229,10 @@ <h2>Downloads</h2>
                     <div class="button" id="deleteAllMods">Delete all mods</div>
                     <div class="buttonLabel">Disables and deletes all mods from the currently selected game</div>
                 </div>
+                <div class="buttonContainer">
+                    <div class="button" id="uninstallBS">Uninstall Beat Saber</div>
+                    <div class="buttonLabel">Experimental way to fix the ghost Beat Saber issue</div>
+                </div>
                 <div id="updateTextBox" class="textBox"></div>
 
                 <div class="space">
@@ -281,13 +292,6 @@ <h2>Downloads</h2>
                     <br>
                     You can delete backups in the <code>Backup</code> section
                 </div>
-                <div class="about">
-                    Quest App Version Switcher version <div id="version" class="inline"></div>
-                    Accessible via browser at:
-                    <div id="ips">
-
-                    </div>
-                </div>
             </div>
         </div>
 

QuestAppVersionSwitcher/Assets/html/qavs_inject.js

@@ -35,16 +35,16 @@ function UpdatePopUps() {
             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>` : ``}
+                ${queuedMods.length > 0 ? `<b>${queuedMods.length}</b> mods queued<br>` : ``}
+                ${installingMods.length > 0 ? `<b>${installingMods.length}</b> mods installing<br>` : ``}
+                ${downloadingMods.length > 0 ? `<b>${downloadingMods.length}</b> mods downloading<br>` : ``}
+                ${downloadingDependencies.length > 0 ? `<b>${downloadingDependencies.length}</b> dependencies downloading<br>` : ``}
+                ${errors.length > 0 ? `<div style="color: #EE0000;"><b>${errors.length}</b> errors, more info in installed mods tab</div><br>` : ``}
             `;
-            if(!html) {
-                html = "All done!"
-            } else {
+            if(html.trim()) {
                 somethingWasRunning = true
+            } else {
+                html = "All done!"
             }
             qavsPopupContainer.innerHTML = html;
             qavsPopupContainer.style.display = somethingWasRunning ? "block" : "none";

QuestAppVersionSwitcher/Assets/html/script.js

@@ -489,6 +489,10 @@ function CheckStartParams() {
     }
 }
 
+document.getElementById("uninstallBS").onclick = () => {
+    fetch("/api/android/uninstallpackage?package=com.beatgames.beatsaber&force=true", {method: "POST"})
+}
+
 var config = {}
 var selectedBackup = ""
 
@@ -561,7 +565,7 @@ function UpdateUI(closeLists = false) {
         document.getElementById("version").innerHTML = res.version
         document.getElementById("ips").innerHTML = ""
         res.browserIPs.forEach(i => {
-            document.getElementById("ips").innerHTML += i + "<br>"
+            document.getElementById("ips").innerHTML += "<div style='margin-top: 15px;'><code>" + i + "</code></div>"
         })
     }))
     Array.prototype.forEach.call(document.getElementsByClassName("selectedBackupName"), i => {

QuestAppVersionSwitcher/Assets/html/style.css

@@ -403,7 +403,7 @@ body {
 }
 
 .about {
-    margin-top: 40px;
+    margin-bottom: 20px;
 }
 
 .infiniteList {

QuestAppVersionSwitcher/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.11.4" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="67">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.11.5" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="68">
 	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="32" />
 	<uses-permission android:name="oculus.permission.handtracking" />
 	<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />

QuestAppVersionSwitcher/Properties/AssemblyInfo.cs

@@ -22,5 +22,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("1.11.4.0")]
-[assembly: AssemblyFileVersion("1.11.4.0")]
+[assembly: AssemblyVersion("1.11.5.0")]
+[assembly: AssemblyFileVersion("1.11.5.0")]

QuestAppVersionSwitcher/WebServer.cs

@@ -555,7 +555,7 @@ public void Start()
                     return true;
                 }
                 string package = serverRequest.queryString.Get("package");
-                if (!AndroidService.IsPackageInstalled(package))
+                if (!AndroidService.IsPackageInstalled(package) && serverRequest.queryString.Get("force") == null)
                 {
                     serverRequest.SendString(GenericResponse.GetResponse("App is already uninstalled", true), "application/json", 230);
                     return true;