Update launch method (may still not work) add try catch around unity index check

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

QuestAppVersionSwitcher/Assets/html/script.js

@@ -797,6 +797,12 @@ function CheckStartParams() {
         GotoStep(18)
         document.getElementById("loginerror").innerText = params.get("loginerror")
     }
+    
+    if(params.get("loginsuccess")) {
+        alert("logged in")
+        location = location.href.split('?')[0]
+        return
+    }
 
     if(params.get("token")) {
         //OpenTokenPasswordPopup()

QuestAppVersionSwitcher/PatchingManager.cs

@@ -189,25 +189,37 @@ public static void PatchAPK(ApkZip apkArchive, string appLocation, bool forcePat
         public static bool AttemptDownloadUnstrippedUnity(string version)
         {
             Logger.Log("Checking index for unstrippedUnity");
-            WebClient c = new WebClient();
-            string libUnityIndexString = c.DownloadString("https://raw.githubusercontent.com/Lauriethefish/QuestUnstrippedUnity/main/index.json");
-            Dictionary<string, Dictionary<string, string>> index = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(libUnityIndexString);
-            string appId = CoreService.coreVars.currentApp;
-            if (index.ContainsKey(appId))
+            try
             {
-                if (index[appId].ContainsKey(version))
+                WebClient c = new WebClient();
+                string libUnityIndexString =
+                    c.DownloadString(
+                        "https://raw.githubusercontent.com/Lauriethefish/QuestUnstrippedUnity/main/index.json");
+                Dictionary<string, Dictionary<string, string>> index =
+                    JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(libUnityIndexString);
+                string appId = CoreService.coreVars.currentApp;
+                if (index.ContainsKey(appId))
                 {
-                    c.DownloadFile("https://raw.githubusercontent.com/Lauriethefish/QuestUnstrippedUnity/main/versions/" + index[appId][version] + ".so", CoreService.coreVars.QAVSTmpPatchingDir + "libunity.so");
-                    return true;
+                    if (index[appId].ContainsKey(version))
+                    {
+                        c.DownloadFile(
+                            "https://raw.githubusercontent.com/Lauriethefish/QuestUnstrippedUnity/main/versions/" +
+                            index[appId][version] + ".so", CoreService.coreVars.QAVSTmpPatchingDir + "libunity.so");
+                        return true;
+                    }
+                    else
+                    {
+                        Logger.Log("No unstripped libunity found. It does exist for another version of the app");
+                    }
                 }
                 else
                 {
-                    Logger.Log("No unstripped libunity found. It does exist for another version of the app");
+                    Logger.Log("No unstripped libunity found.", LoggingType.Warning);
                 }
             }
-            else
+            catch (Exception e)
             {
-                Logger.Log("No unstripped libunity found.", LoggingType.Warning);
+                Logger.Log("Failed to check index for unstripped libunity: " + e, LoggingType.Warning);
             }
             return false;
         }

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.6" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="127">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.15.7" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="128">
 	<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.15.6.0")]
-[assembly: AssemblyFileVersion("1.15.6.0")]
+[assembly: AssemblyVersion("1.15.7.0")]
+[assembly: AssemblyFileVersion("1.15.7.0")]

QuestAppVersionSwitcher/QAVSWebViewClient.cs

@@ -135,7 +135,8 @@ public override bool ShouldOverrideUrlLoading(WebView view, IWebResourceRequest
                 try
                 {
                     string token = QAVSWebserver.loginClient.UriCallback(request.Url.ToString());
-                    view.LoadUrl("http://127.0.0.1:" + CoreService.coreVars.serverPort + "?token=" + token);
+                    QAVSWebserver.SaveToken(token);
+                    view.LoadUrl("http://127.0.0.1:" + CoreService.coreVars.serverPort + "?loginsuccess=true");
                 }
                 catch (Exception e)
                 {

QuestAppVersionSwitcher/WebServer.cs

@@ -137,6 +137,14 @@ public static void BroadcastUIConfig()
         public static BackupStatus backupStatus = new BackupStatus();
         public static LoginClient loginClient = new LoginClient();
 
+        public static void SaveToken(string token)
+        {
+            string password = AndroidService.GetDeviceID();
+            CoreService.coreVars.token = PasswordEncryption.Encrypt(token, password);
+            CoreService.coreVars.password = GetSHA256OfString(password);
+            CoreService.coreVars.Save();
+        }
+        
         public void Start()
         {
             wsServer.OnMessage = (socket, msg) =>
@@ -551,13 +559,13 @@ public void Start()
             });
 			server.AddRoute("GET", "/api/android/installedappsandbackups", serverRequest =>
             {
-                List<App> apps = AndroidService.GetInstalledApps();
+                List<AndroidApp> apps = AndroidService.GetInstalledApps();
 
                 foreach (string f in Directory.GetDirectories(CoreService.coreVars.QAVSBackupDir))
                 {
                     if (apps.FirstOrDefault(x => x.PackageName == Path.GetFileName(f)) == null)
                     {
-                        apps.Add(new App("unknown", Path.GetFileName(f)));
+                        apps.Add(new AndroidApp("unknown", Path.GetFileName(f)));
                     }
                 }
                 serverRequest.SendString(JsonSerializer.Serialize(apps), "application/json");