fixes

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/flows/beat_saber_modding.html

@@ -248,7 +248,12 @@ <h1>Download is done!</h1>
                 method: "POST",
                 body: `https://oculusdb.rui2015.me/api/coremodsdownload/${moddedStatus.version}.qmod`
             }).then(res => {
-                location = start + "/?tab=mods"
+                fetch(start + `/api/mods/installfromurl`, {
+                    method: "POST",
+                    body: `https://github.com/ComputerElite/QuestAppVersionSwitcher/releases/download/1.10.8/CustomTypesPatched.qmod`
+                }).then(res => {
+                    location = start + "/?tab=mods"
+                })
             })
         })
     }
@@ -258,13 +263,20 @@ <h1>Download is done!</h1>
     }
 
     function PatchDone() {
+        modgameloader.style.display = "none"
         OpenTab("afterpatch")
     }
 
     function RestoreBackup() {
         location = start + `/?package=com.beatgames.beatsaber&backup=${patchReport.backupName}&restorenow=true&noaccesscheck=true&afterrestore=${encodeURIComponent(`/flows/beat_saber_modding?tab=afterrestore`)}`
     }
 
+    function ResetPatchPage() {
+
+        document.getElementById("modgamebutton").style.display = "block"
+        modgameloader.style.display = "none"
+    }
+    
     function PatchGame() {
         const patchOptions = {
             otherPermissions: [],
@@ -275,6 +287,7 @@ <h1>Download is done!</h1>
         }
         document.getElementById("modgamebutton").style.display = "none"
         patchInProgressContainer.style.display = "block"
+        modgameloader.style.display = "block"
         patchingStatus.className = ""
         patchingStatus.classList.add("text")
         fetch(start + `/api/patching/patchoptions`, {
@@ -299,6 +312,7 @@ <h1>Download is done!</h1>
                                     } else if (j.error) {
                                         patchingStatus.innerHTML = j.errorText
                                         patchingStatus.classList.add("error")
+                                        ResetPatchPage()
                                         clearInterval(i)
                                     } else {
                                         patchingStatus.innerHTML =  j.progressString + " - " + j.currentOperation
@@ -308,6 +322,7 @@ <h1>Download is done!</h1>
                         }, 500);
                     } else {
                         patchingStatus.innerHTML =  j.msg
+                        ResetPatchPage()
                         patchingStatus.classList.add("error")
                     }
                 })

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.12.0" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="69">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.12.1" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="70">
 	<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.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.12.1.0")]
+[assembly: AssemblyFileVersion("1.12.1.0")]

QuestAppVersionSwitcher/WebServer.cs

@@ -388,6 +388,8 @@ public void Start()
                 string apkPath = "";
                 if (package != null && backup != null)
                 {
+                    
+                    Logger.Log("Trying to patch apk from backup " + package + " - " + backup);
                     string backupDir = CoreService.coreVars.QAVSBackupDir + package + "/" + backup + "/";
                     if (!Directory.Exists(backupDir))
                     {
@@ -406,14 +408,14 @@ public void Start()
                     if (!AndroidService.IsPackageInstalled(CoreService.coreVars.currentApp))
                     {
                         request.SendString(GenericResponse.GetResponse(CoreService.coreVars.currentApp + "is not installed. Please install it", true), "application/json", 202);
-
                         return true;
                     }
 
                     apkPath = AndroidService.FindAPKLocation(CoreService.coreVars.currentApp);
                 }         
                 request.SendString(GenericResponse.GetResponse("Acknowledged. Check status at /patching/patchstatus", true), "application/json", 202);
 
+                Logger.Log("Using apk from  " + apkPath);
 
                 string appLocation = CoreService.coreVars.QAVSTmpPatchingDir + "app.apk";
                 FileManager.RecreateDirectoryIfExisting(CoreService.coreVars.QAVSTmpPatchingDir);