add launch game button to side bar, add free space to /api/android/device

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/index.html

@@ -13,6 +13,7 @@
                 <div style="font-size: 80%; width: 100%;">
                     Managing <div class="inline packageName">some game</div>
                 </div>
+                <div class="button" style="margin-top: 5px;" onclick="LaunchApp()">Launch Game</div>
             </div>
             <div class="menuItem selected" section="backup">Backup</div>
             <div class="menuItem" section="downgrade">Downgrade</div>

QuestAppVersionSwitcher/Assets/html/script.js

@@ -193,6 +193,8 @@ if(!IsOnQuest()) {
     document.getElementById("restoreBackup").classList.add("notActive")
     document.getElementById("onPcInfo").classList.remove("hidden")
     document.getElementById("uninstall").classList.add("notActive")
+    document.getElementById("login").classList.add("notActive")
+    document.getElementById("logout").classList.add("notActive")
     //document.getElementById("getModsButton").style.display = "none"
 
 } else {
@@ -693,6 +695,7 @@ function UpdateUI(closeLists = false) {
 }
 
 document.getElementById("login").onclick = () => {
+    if(!IsOnQuest()) return;
     OpenGetPasswordPopup()
     GotoStep(9)
 }
@@ -784,11 +787,13 @@ function ChangeApp(package) {
     config.currentApp = package
     fetch("/api/questappversionswitcher/changeapp", {
         method: "POST",
-        body: package
-    }).then(() => UpdateUI(true))
+        body: JSON.stringify({packageName: package})
+    }).then(() => {
+        UpdateUI(true)
+        UpdateCosmeticsTypes()
+        CheckFolderPermission()
+    })
     UpdateUI(true)
-    UpdateCosmeticsTypes()
-    CheckFolderPermission()
 }
 
 document.getElementById("exit").onclick = () => {
@@ -1257,10 +1262,15 @@ document.getElementById("downloadStartingClosePopup").onclick = () => {
 }
 
 document.getElementById("logout").onclick = () => {
+    if(!IsOnQuest()) return;
     Logout()
 }
 
 function Logout() {
+    if(!IsOnQuest()) {
+        alert("Cannot log out when on PC. Open QAVS in your quest")
+        return;
+    }
     fetch("/api/logout", {
         method: "POST"
     }).then(res => {

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.13.11" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="94">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.12" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="95">
 	<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.13.11.0")]
-[assembly: AssemblyFileVersion("1.13.11.0")]
+[assembly: AssemblyVersion("1.13.12.0")]
+[assembly: AssemblyFileVersion("1.13.12.0")]

QuestAppVersionSwitcher/WebServer.cs

@@ -134,6 +134,24 @@ public override bool ShouldOverrideUrlLoading(WebView view, string url)
     public class AndroidDevice
     {
         public int sdkVersion { get; set; } = 0;
+        public long freeSpace { get; set; } = 0;
+
+        public string freeSpaceString
+        {
+            get
+            {
+                return SizeConverter.ByteSizeToString(freeSpace);
+            }
+        }
+        public long totalSpace { get; set; } = 0;
+
+        public string totalSpaceString
+        {
+            get
+            {
+                return SizeConverter.ByteSizeToString(totalSpace);
+            }
+        }
     }
 
     public enum LoggedInStatus
@@ -655,7 +673,9 @@ public void Start()
             {
                 serverRequest.SendString(JsonSerializer.Serialize(new AndroidDevice()
                 {
-                    sdkVersion = (int)Build.VERSION.SdkInt
+                    sdkVersion = (int)Build.VERSION.SdkInt,
+                    freeSpace = Environment.ExternalStorageDirectory.UsableSpace,
+                    totalSpace = Environment.ExternalStorageDirectory.TotalSpace,
                 }), "application/json");
                 return true;
             });
@@ -804,8 +824,9 @@ public void Start()
             });
             server.AddRoute("POST", "/api/questappversionswitcher/changeapp", serverRequest =>
             {
-                ChangeApp(serverRequest.bodyString);
-                serverRequest.SendString(GenericResponse.GetResponse("App changed to " + serverRequest.bodyString, true), "application/json");
+                ChangeAppRequest request = JsonSerializer.Deserialize<ChangeAppRequest>(serverRequest.bodyString);
+                ChangeApp(request.packageName, request.name);
+                serverRequest.SendString(GenericResponse.GetResponse("App changed to " + request.packageName, true), "application/json");
                 return true;
             });
             server.AddRoute("GET", "/api/questappversionswitcher/config", serverRequest =>
@@ -1364,11 +1385,11 @@ public void Start()
             t.Start();
         }
 
-        private void ChangeApp(string packageName)
+        private void ChangeApp(string packageName, string name = "")
         {
             Logger.Log("Settings selected app to " + packageName);
             CoreService.coreVars.currentApp = packageName;
-            CoreService.coreVars.currentAppName = AndroidService.GetAppname(packageName);
+            CoreService.coreVars.currentAppName = name == "" ? AndroidService.GetAppname(packageName) : name;
             CoreService.coreVars.Save();
             QAVSModManager.Update();
         }
@@ -1490,6 +1511,12 @@ public List<string> GetIPs()
         }
     }
 
+    public class ChangeAppRequest
+    {
+        public string packageName { get; set; } = "";
+        public string name { get; set; } = "";
+    }
+
     public class BackupInfo
     {
         public BackupInfoVersion BackupInfoVersion { get; set; } = BackupInfoVersion.V4;