Add version selection

ComputerElite · ComputerElite · commit a4c8d51f2125 · 2024-03-31T11:52:39.000+02:00
diff --git a/QuestAppVersionSwitcher/AndroidDevice.cs b/QuestAppVersionSwitcher/AndroidDevice.cs
@@ -1,4 +1,5 @@
-﻿using ComputerUtils.Android.VarUtils;
+﻿using Android.OS;
+using ComputerUtils.Android.VarUtils;
 
 namespace QuestAppVersionSwitcher
 {
@@ -24,5 +25,16 @@ public string totalSpaceString
                 return SizeConverter.ByteSizeToString(totalSpace);
             }
         }
+
+        public static AndroidDevice GetCurrent()
+        {
+            return new AndroidDevice()
+            {
+                sdkVersion = (int)Build.VERSION.SdkInt,
+                device = Build.Device,
+                freeSpace = Environment.ExternalStorageDirectory.UsableSpace,
+                totalSpace = Environment.ExternalStorageDirectory.TotalSpace,
+            };
+        }
     }
 }
diff --git a/QuestAppVersionSwitcher/Assets/html/flows/beat_saber_modding.html b/QuestAppVersionSwitcher/Assets/html/flows/beat_saber_modding.html
@@ -9,7 +9,7 @@
 <body>
 <div class="content" id="checking">
     <h1>Checking your current Beat Saber install</h1>
-    <h3>Please wait a bit. This may take 3 minute</h3>
+    <h3>Please wait a bit. This may take 3 minutes</h3>
     <div class="loaderContainer center">
         <div class="loaderBarRight"></div>
         <div class="loaderBarLeft"></div>
@@ -169,6 +169,45 @@ <h1>QAVS can currently not manage mods for Quest 3!</h1>
         <br>You can ask for help in the #quest-help channel at discord.gg/beatsabermods (Discord Server).
     </p>
 </div>
+<div class="content hidden" id="sl2">
+    <h1>QAVS can currently not patch Beat Saber for you!</h1>
+    <p>
+        QAVS cannot patch Beat Saber. For that you will have to use QuestPatcher on your PC with Scotland2 selected.
+        <br>
+        After patching Beat Saber you can come back to QAVS to install and manage mods.
+        <br>
+        You can ask for help in the #quest-help channel at discord.gg/beatsabermods (Discord Server).
+
+        <br>
+        <br>
+        <button onclick="location.reload()">I installed Beat Saber. Please check my game again.</button>
+    </p>
+</div>
+<div class="content hidden" id="notInstalled">
+    <h1>Beat Saber is not installed</h1>
+    <p>
+        You must install Beat Saber from the store in order to mod it. Please come back after modding Beat Saber
+    </p>
+    <br>
+    <br>
+    <button onclick="location.reload()">I patched using QuestPatcher. Please check my game again.</button>
+</div>
+<div class="content hidden" id="selectVersion">
+    <h1>Select a version</h1>
+    <p>
+        First you'll need to select one of the recommended game version you want to mod. If you're not sure which to choose just press <code>Next</code>
+    </p>
+    <br>
+    <select id="gameVersions">
+        
+    </select>
+    <br>
+    <button onclick="VersionSelected()">Next</button>
+    <br>
+    <br>
+    <br>
+    <button style="font-size: 0.7rem" onclick="SelectVersion(true)">Show all versions (not recommended></button>
+</div>
 <div style="position: fixed; bottom: 10px; left: 10px;">
     <button id="showSupportButton" onclick="ShowSupport()">Help</button>
     <div id="helpSection" style="display: none;" class="box">
@@ -207,6 +246,11 @@ <h2>Upload logs</h2>
     var tab = params.get('tab');
     var checkdowngrade = params.get('checkdowngrade');
     var startDownload = params.get('startdownload');
+    var versionSpecified = false
+    if(params.get("version")) {
+        selectedVersion = params.get("version")
+        versionSpecified = true
+    }
     const start = ""
     const squareLoader = `
     <div class="loaderContainer center">
@@ -220,8 +264,37 @@ <h2>Upload logs</h2>
         <div class="loaderSquare"></div>
     </div>`
     
+    function VersionSelected() {
+        selectedVersion = document.getElementById("gameVersions").value
+        versionSpecified = true
+        FirstOpen()
+    }
+    
+    function SelectVersion(showAll = false) {
+        fetch("https://raw.githubusercontent.com/ComputerElite/QuestAppVersionSwitcher/main/Assets/downgrade.json").then(res => res.json().then(downgrade => {
+            UpdateSupportedBeatSaberVersions().then(() => {
+                if(SupportedBeatSaberVersions.length < 0) {
+                    OpenTab("offline")
+                    return
+                }
+                versions = downgrade.recommendedVersions
+                if(!versions.includes(SupportedBeatSaberVersions[0])) versions.unshift(SupportedBeatSaberVersions[0])
+                if(showAll) versions = SupportedBeatSaberVersions
+                
+                var html = ""
+                for(const v of versions) {
+                    html += `<option value="${v}">${SupportedBeatSaberVersions[0] == v ? `${v} (latest)` : v}</option>`
+                }
+                document.getElementById("gameVersions").innerHTML = html
+                OpenTab("selectVersion")
+            })
+        })).catch(err => {
+            console.log(err)
+            OpenTab("offline")
+        })
+    }
+    
     function InitialStuff() {
-
         if(tab) {
             if(tab == "afterrestore") {
                 fetch(start + "/api/android/device").then(res => res.json().then(j => {
@@ -313,6 +386,7 @@ <h2>Upload logs</h2>
     function ModSettings() {
         location = start + `/?tab=patching`
     }
+    var patchExtras = ""
     function ModDowngradedGame() {
         patchExtras = `?package=${lastDownloadProgress.packageName}&backup=${lastDownloadProgress.backupName}`
         OpenTab("modgame")
@@ -409,7 +483,7 @@ <h2>Upload logs</h2>
             return
         }
         fetch(start + "/api/cleardownloads", {method: "POST"})
-        location = start + `/?download=true&version=${SupportedBeatSaberVersions[0]}&noaccesscheck=true&game=2448060205267927&afterdownload=${encodeURIComponent(start + `/flows/beat_saber_modding?tab=download&startdownload=true`)}`
+        location = start + `/?download=true&version=${selectedVersion}&noaccesscheck=true&game=2448060205267927&afterdownload=${encodeURIComponent(start + `/flows/beat_saber_modding?tab=download&startdownload=true`)}`
     }
     
     function CheckDowngrade() {
@@ -418,12 +492,12 @@ <h2>Upload logs</h2>
                 el.innerText = moddedStatus.isInstalled ? moddedStatus.version : "Not installed"
             }
             for(const el of document.getElementsByClassName("supportedBsVersion")) {
-                el.innerText = SupportedBeatSaberVersions[0]
+                el.innerText = selectedVersion
             }
             // Check if the latest version is already downloaded by getting backup list of Beat Saber, then checking
             fetch(start + "/api/backups?package=com.beatgames.beatsaber").then(res => res.json().then(j => {
                 for(const b of j.backups) {
-                    if(b.gameVersion == SupportedBeatSaberVersions[0] && b.isDownloadedFromOculus) {
+                    if(b.gameVersion == selectedVersion && b.isDownloadedFromOculus) {
                         // Game version is already downloaded. Show mod game button
                         console.log("Found backup for latest modable version, showing mod game button")
                         // emulate finished download
@@ -447,7 +521,9 @@ <h2>Upload logs</h2>
                         currentSha = json.msg
                         console.log(currentSha)
                         fetch("https://raw.githubusercontent.com/ComputerElite/APKDowngrader/main/versions.json").then(res => res.json().then(patches => {
-                            patches = patches.versions.filter(x => x.SSHA256 == currentSha && x.TV == SupportedBeatSaberVersions[0])
+                            patches = patches.versions.filter(x => x.SSHA256 == currentSha && x.TV == selectedVersion)
+                            console.log("Apk sha is " + currentSha)
+                            console.log()
                             if (patches.length <= 0) {
                                 // No patches found
                                 OpenTab("patcheserror")
@@ -549,7 +625,7 @@ <h2>Upload logs</h2>
             handTrackingVersion: 0, // Default
             externalStorage: true,
             openXR: true,
-            modloader: moddedStatus.recommendedModloader // QuestLoader = 0, Scotland2 = 1 
+            modloader: modloader // QuestLoader = 0, Scotland2 = 1 
         }
         document.getElementById("modgamebutton").style.display = "none"
         patchInProgressContainer.style.display = "block"
@@ -601,30 +677,52 @@ <h2>Upload logs</h2>
     function UpdateModGamePage() {
         document.getElementById("modgamebsversion").innerText = moddedStatus.version;
     }
+    
+    var selectedVersion = ""
+    var modloader = 0
 
     function FirstOpen() {
         // Not logged in
+        OpenTab("checking")
+        if(!selectedVersion) {
+            // let user select the version they want to use
+            SelectVersion()
+            return
+        }
         UpdateModdedStatus().then(() => {
             if(!moddedStatus.isInstalled) {
                 // Downgrade
-                OpenTab(diffDowngradeEnabled ? "downgradeLoginDiff" : "downgrade")
-                CheckDowngrade()
+                if(diffDowngradeEnabled) {
+                    OpenTab("notInstalled")
+                } else {
+                    OpenTab("downgrade")
+                    CheckDowngrade()
+                }
             } else {
                 UpdateSupportedBeatSaberVersions().then(() => {
+                    if(selectedVersion == "" && SupportedBeatSaberVersions.length > 0) {
+                        selectedVersion = SupportedBeatSaberVersions[0]
+                    }
                     if(SupportedBeatSaberVersions.length <= 0) {
                         // OH NO; USER IS OFFLINE
                         OpenTab("offline")
-                    } else if(SupportedBeatSaberVersions[0] == moddedStatus.version) {
+                    } else if(selectedVersion == moddedStatus.version) {
                         // Continue with modding
-
-                        if(moddedStatus.isPatched) {
-                            // Already modded
-                            OpenTab("alreadymodded")
-                        } else {
-                            // Not modded
-                            OpenTabIfSAFAccess("modgame")
-                            UpdateModGamePage()
-                        }
+                        fetch(`${start}/api/patching/recommendmodloader?package=com.beatgames.beatsaber&version=${selectedVersion}`).then(res => res.json().then(j => {
+                            modloader = j.modloader
+                            if(moddedStatus.isPatched) {
+                                // Already modded
+                                OpenTab("alreadymodded")
+                            } else {
+                                // Not modded
+                                if(modloader == 1 && moddedStatus.device.sdkVersion >= 32) {
+                                    OpenTab("sl2")
+                                } else {
+                                    OpenTabIfSAFAccess("modgame")
+                                    UpdateModGamePage()
+                                }
+                            }
+                        }))
                     } else {
                         // Downgrade
                         CheckDowngrade()
@@ -639,6 +737,7 @@ <h2>Upload logs</h2>
 
     function UpdateSupportedBeatSaberVersions() {
         return new Promise((resolve, reject) => {
+            SupportedBeatSaberVersions = []
             fetch("https://computerelite.github.io/tools/Beat_Saber/coreMods.json").then(res => res.json().then(j => {
                 for(const [key, value] of Object.entries(j)) {
                     SupportedBeatSaberVersions.push(key);
diff --git a/QuestAppVersionSwitcher/Assets/html/index.html b/QuestAppVersionSwitcher/Assets/html/index.html
@@ -358,6 +358,14 @@ <h2>Downloads</h2>
                     </label>
                     Use Diff downgrading (disable means use default)
                 </label>
+                <br>
+                <label class="option">
+                    <label class="switch normal">
+                        <input id="installModsQ3" type="checkbox">
+                        <span class="slider round"></span>
+                    </label>
+                    Install mods anyway on Q3 (not recommended as it most likely won't work)
+                </label>
                 <div class="buttonContainer">
                     <div class="button" id="checkUpdate">Check for QuestAppVersionSwitcher updates</div>
                     <div class="buttonLabel">Checks if updates for QuestAppVersionSwitcher exist</div>
diff --git a/QuestAppVersionSwitcher/Assets/html/script.js b/QuestAppVersionSwitcher/Assets/html/script.js
@@ -331,14 +331,20 @@ fetch("/api/android/device").then(res => res.json().then(res => {
 }))
 
 function UpdateInstalledModsQuest3Hint() {
-    var isOnQuest3 = device == "eureka" && modloader == 0 // only hide mods stuff on QuestLoader
+    var isOnQuest3 = device == "eureka" && modloader == 0 && !localStorage.installModsQ3 // only hide mods stuff on QuestLoader
     for(const e of document.getElementsByClassName("quest3hide")) {
         e.style.display = isOnQuest3 ? "none" : "block"
     }
     for(const e of document.getElementsByClassName("quest3show")) {
         e.style.display = isOnQuest3 ? "block" : "none"
     }
 }
+document.getElementById("installModsQ3").checked = localStorage.installModsQ3 == "true"
+
+document.getElementById("installModsQ3").onchange = () => {
+    localStorage.installModsQ3 = document.getElementById("installModsQ3").checked
+    UpdateInstalledModsQuest3Hint()
+}
 
 function LaunchApp() {
     fetch("/api/android/launch", {
diff --git a/QuestAppVersionSwitcher/ClientModels.cs b/QuestAppVersionSwitcher/ClientModels.cs
@@ -12,6 +12,7 @@ public class PatchingStatus
         public string version { get; set; } = "";
         public string copyOf { get; set; } = "";
         public string versionCode { get; set; } = "";
+        public AndroidDevice device { get; set; } = new AndroidDevice();
         public ModLoader recommendedModloader { get; set; } = ModLoader.QuestLoader;
         public string package { get; set; } = "";
         public ModdedJson moddedJson { get; set; } = null;
diff --git a/QuestAppVersionSwitcher/FolderPermission.cs b/QuestAppVersionSwitcher/FolderPermission.cs
@@ -268,7 +268,6 @@ public static void DeleteDirectoryContent(string dir)
 
         public static bool NeedsSAF()
         {
-            //return false;
             return Build.VERSION.SdkInt > BuildVersionCodes.Q;
         }
         
diff --git a/QuestAppVersionSwitcher/PatchingManager.cs b/QuestAppVersionSwitcher/PatchingManager.cs
@@ -13,6 +13,7 @@
 using System.Net;
 using System.Text;
 using System.Text.Json;
+using Android.OS;
 using JetBrains.Annotations;
 using QuestAppVersionSwitcher.Mods;
 using QuestPatcher.QMod;
@@ -412,6 +413,7 @@ public static PatchingStatus GetPatchingStatus(ApkZip apk, string packageId = ""
             manifestStream.Dispose();
             status.package = packageId;
             status.recommendedModloader = GetRecommendedModloader(status);
+            status.device = AndroidDevice.GetCurrent();
             return status;
         }
 
@@ -459,6 +461,7 @@ public static PatchingStatus GetPatchingStatus(ZipArchive apk, string packageId
             status.moddedJson = GetModdedJson(apk);
             status.package = packageId;
             status.recommendedModloader = GetRecommendedModloader(status);
+            status.device = AndroidDevice.GetCurrent();
             manifestStream.Close();
             manifestStream.Dispose();
             return status;
diff --git a/QuestAppVersionSwitcher/Properties/AndroidManifest.xml b/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.15.18" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="139">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.15.19" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="140">
 	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="32" />
 	<uses-permission android:name="oculus.permission.handtracking" />
 	<uses-permission android:name="com.oculus.permission.HAND_TRACKING" />
diff --git a/QuestAppVersionSwitcher/Properties/AssemblyInfo.cs b/QuestAppVersionSwitcher/Properties/AssemblyInfo.cs
@@ -22,5 +22,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("1.15.18.0")]
-[assembly: AssemblyFileVersion("1.15.18.0")]
+[assembly: AssemblyVersion("1.15.19.0")]
+[assembly: AssemblyFileVersion("1.15.19.0")]
diff --git a/QuestAppVersionSwitcher/WebServer.cs b/QuestAppVersionSwitcher/WebServer.cs
@@ -40,6 +40,7 @@
 using Newtonsoft.Json;
 using OculusGraphQLApiLib.GraphQL;
 using QuestAppVersionSwitcher.DiffDowngrading;
+using QuestPatcher.QMod;
 using QuestPatcher.Zip;
 using DownloadStatus = QuestAppVersionSwitcher.ClientModels.DownloadStatus;
 using Environment = Android.OS.Environment;
@@ -283,6 +284,24 @@ public void Start()
                 request.SendString(JsonSerializer.Serialize(CoreService.coreVars.patchingPermissions), "application/json");
                 return true;
             });
+            server.AddRoute("GET", "/api/patching/recommendmodloader", request =>
+            {
+                string package = request.queryString.Get("package");
+                if (package == null)
+                {
+                    request.SendString(ModLoaderResponse.GetResponse("No package specified", ModLoader.QuestLoader, false), "application/json", 400);
+                    return true;
+                }
+                string version = request.queryString.Get("version");
+                if (version == null)
+                {
+                    request.SendString(ModLoaderResponse.GetResponse("No version specified", ModLoader.QuestLoader, false), "application/json", 400);
+                    return true;
+                }
+                ModLoader recommended = PatchingManager.GetRecommendedModloader(new PatchingStatus {version = version, package = package});
+                request.SendString(JsonSerializer.Serialize(ModLoaderResponse.GetResponse(recommended.ToString(), recommended, true)), "application/json");
+                return true;
+            });
             server.AddRoute("POST", "/api/patching/patchoptions", request =>
             {
                 CoreService.coreVars.patchingPermissions = JsonSerializer.Deserialize<PatchingPermissions>(request.bodyString);
@@ -560,13 +579,7 @@ public void Start()
             });
             server.AddRoute("GET", "/api/android/device", serverRequest =>
             {
-                serverRequest.SendString(JsonSerializer.Serialize(new AndroidDevice()
-                {
-                    sdkVersion = (int)Build.VERSION.SdkInt,
-                    device = Build.Device,
-                    freeSpace = Environment.ExternalStorageDirectory.UsableSpace,
-                    totalSpace = Environment.ExternalStorageDirectory.TotalSpace,
-                }), "application/json");
+                serverRequest.SendString(JsonSerializer.Serialize(AndroidDevice.GetCurrent()), "application/json");
                 return true;
             });
 			server.AddRoute("POST", "/api/android/launch", serverRequest =>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using ComputerUtils.Android.VarUtils;`
	`1`	`+using Android.OS;`
	`2`	`+using ComputerUtils.Android.VarUtils;`
`2`	`3`
`3`	`4`	`namespace QuestAppVersionSwitcher`
`4`	`5`	`{`
`@@ -24,5 +25,16 @@ public string totalSpaceString`
`24`	`25`	`return SizeConverter.ByteSizeToString(totalSpace);`
`25`	`26`	`}`
`26`	`27`	`}`
	`28`	`+`
	`29`	`+ public static AndroidDevice GetCurrent()`
	`30`	`+ {`
	`31`	`+ return new AndroidDevice()`
	`32`	`+ {`
	`33`	`+ sdkVersion = (int)Build.VERSION.SdkInt,`
	`34`	`+ device = Build.Device,`
	`35`	`+ freeSpace = Environment.ExternalStorageDirectory.UsableSpace,`
	`36`	`+ totalSpace = Environment.ExternalStorageDirectory.TotalSpace,`
	`37`	`+ };`
	`38`	`+ }`
`27`	`39`	`}`
`28`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,6 @@ public static void DeleteDirectoryContent(string dir)`
`268`	`268`
`269`	`269`	`public static bool NeedsSAF()`
`270`	`270`	`{`
`271`		`- //return false;`
`272`	`271`	`return Build.VERSION.SdkInt > BuildVersionCodes.Q;`
`273`	`272`	`}`
`274`	`273`