comitting

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/index.html

@@ -215,7 +215,7 @@ <h2>Downloads</h2>
                 </div>
                 <div class="buttonContainer">
                     <div class="button" id="deleteAllMods">Delete all mods</div>
-                    <div class="buttonLabel">Disables and deletes all mods frome the currently selected game</div>
+                    <div class="buttonLabel">Disables and deletes all mods from the currently selected game</div>
                 </div>
                 <div id="updateTextBox" class="textBox"></div>
 
@@ -515,7 +515,7 @@ <h2>Downloads</h2>
                 <div class="contentHeader headerMargin">
                     Access needed
                 </div>
-                To create backups, restore backups and manage mods, QuestAppVersionSwitcher needs access to Android data and obb folder. To grant access press the <code>Grant access</code> button below and press <code>Use this folder</code>
+                To create backups, restore backups and manage mods, QuestAppVersionSwitcher needs access to Android data and obb folder. To grant access press <code>Grant access</code> below and press <code>Use this folder</code> on <b>both</b> prompts you'll get.
                 <div id="step12box" class="textBox"></div>
                 <div class="buttonSelectionContainer">
                     <div class="buttonContainer">

QuestAppVersionSwitcher/Assets/html/script.js

@@ -578,7 +578,7 @@ setInterval(() => {
                     </div>
                      ${!d.done ? `<input type="button" class="DownloadText" value="Cancel" onclick="StopGameDownload('${d.id}')">` : ``}
                     <div class="DownloadText" style="color: ${d.textColor};">
-                        ${d.canceled ? "Canceled " : ""}${d.status} ${d.progressString} ${d.filesDownloaded} / ${d.filesToDownload} files downloaded
+                        ${d.canceled ? "Canceled " : ""}${d.status}<br>${d.filesDownloaded} / ${d.filesToDownload} files downloaded
                     </div>
                 </div>`
             }
@@ -780,7 +780,7 @@ document.getElementById("uninstall2").onclick = () => {
 document.getElementById("confirm1").onclick = () => {
     fetch("/api/android/ispackageinstalled?package=" + config.currentApp).then(res => {
         res.json().then(j => {
-            if (j.isAppInstalled) GotoStep(3)
+            if (!j.isAppInstalled) GotoStep(3)
             else {
                 TextBoxError("step1box", config.currentApp + " is still installed. Please uninstall it.")
                 GotoStep(1)
@@ -883,6 +883,7 @@ document.getElementById("grantAccess").onclick = () => {
 }
 
 document.getElementById("deleteAllMods").onclick = () => {
+    TextBoxText("updateTextBox", "Deleting all mods...")
     fetch("/api/mods/deleteallmods", {
         method: "POST"
     }).then(res => {
@@ -1056,7 +1057,7 @@ document.getElementById("abortPassword").onclick = () => {
     CloseGetPasswordPopup()
 }
 document.getElementById("confirmPassword").onclick = () => {
-    TextBoxText("step7box", "Waiting for response")
+    TextBoxText("step7box", "Waiting for response and requesting obbs to download from Oculus...")
     options.password = encodeURIComponent(document.getElementById("passwordConfirm").value)
     options.app = options.parentName
     fetch("/api/download", {

QuestAppVersionSwitcher/GameDownloadManager.cs

@@ -2,8 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using ComputerUtils.Android.Encryption;
 using ComputerUtils.Android.FileManaging;
 using ComputerUtils.Android.Logging;
+using OculusGraphQLApiLib;
+using OculusGraphQLApiLib.Results;
 using Org.BouncyCastle.Bcpg.OpenPgp;
 using QuestAppVersionSwitcher.ClientModels;
 using QuestAppVersionSwitcher.Core;
@@ -27,7 +30,7 @@ public class GameDownloadManager
         public List<DownloadManager> downloadManagers { get; set; } = new List<DownloadManager>();
         public List<ObbEntry> obbsToDo { get; set; } = new List<ObbEntry>();
 
-        public DownloadRequest request { get; set; } = null;
+        public DownloadRequest request = null;
         public Thread updateThread = null;
         public bool canceled { get; set; } = false;
         public bool done { get; set; } = false;
@@ -49,12 +52,38 @@ public void StartDownload()
             m.DownloadFinishedEvent += DownloadCompleted;
             m.isCancelable = false;
 
+            //Get OBBs via Oculus api
+            try
+            {
+                GraphQLClient.oculusStoreToken = PasswordEncryption.Decrypt(CoreService.coreVars.token, request.password);
+                AndroidBinary b = GraphQLClient.GetBinaryDetails(request.binaryId).data.node;
+                if (b.obb_binary != null)
+                {
+                    obbsToDo.Add(new ObbEntry
+                    {
+                        id = b.obb_binary.id,
+                        name = b.obb_binary.file_name
+                    });
+                }
+                foreach (AssetFile assetFile in b.asset_files.nodes)
+                {
+                    obbsToDo.Add(new ObbEntry
+                    {
+                        id = assetFile.id,
+                        name = assetFile.file_name
+                    });
+                }
+            }
+            catch (Exception e)
+            {
+                obbsToDo = request.obbList;
+            }
+            
             this.backupName = gameName + " " + version + " Downgraded";
             status = gameName + " " + version;
             downloadManagers.Add(m);
             QAVSWebserver.managers.Add(m);
-            obbsToDo = request.obbList;
-            filesToDownload = 1 + request.obbList.Count;
+            filesToDownload = 1 + obbsToDo.Count;
             updateThread = new Thread(() =>
             {
                 while (filesDownloaded < filesToDownload)
@@ -79,27 +108,16 @@ public void Done()
 
         public void UpdateManagersAndProgress()
         {
-            for(int i = 0; i < downloadManagers.Count; i++)
-            {
-                DownloadManager m = downloadManagers[i];
-                if(m.canceled)
-                {
-                    downloadManagers.RemoveAt(i);
-                    QAVSWebserver.managers.Remove(m);
-                    i--;
-                }
-            }
-            
             progress = filesDownloaded / (double)filesToDownload;
             progressString = (progress * 100).ToString("F") + "%";
 
             for (int i = 0; i < 10 - downloadManagers.Count; i++)
             {
                 if (obbsToDo.Count <= 0) return;
                 DownloadManager m = new DownloadManager();
-                m.StartDownload(obbsToDo[0].id, request.password, request.version, request.app, request.parentId, true, request.packageName, obbsToDo[0].name);
                 m.DownloadFinishedEvent += DownloadCompleted;
                 m.isCancelable = false;
+                m.StartDownload(obbsToDo[0].id, request.password, request.version, request.app, request.parentId, true, request.packageName, obbsToDo[0].name);
                 downloadManagers.Add(m);
                 QAVSWebserver.managers.Add(m);
                 obbsToDo.RemoveAt(0);
@@ -116,27 +134,29 @@ public void Cancel()
                 d.StopDownload();
                 QAVSWebserver.managers.Remove(d);
             }
+            downloadManagers.Clear();
         }
 
         public void DownloadCompleted(DownloadManager m)
         {
             filesDownloaded++;
             QAVSWebserver.managers.Remove(m);
             downloadManagers.Remove(m);
+            string backupDir = CoreService.coreVars.QAVSBackupDir + m.packageName + "/" + m.backupName + "/";
             if(m.isObb)
             {
-                string bbackupDir = CoreService.coreVars.QAVSBackupDir + m.packageName + "/" + m.backupName + "/obb/";
-                FileManager.CreateDirectoryIfNotExisting(bbackupDir);
-                FileManager.DeleteFileIfExisting(bbackupDir + m.obbFileName);
-                File.Move(m.tmpPath, bbackupDir + m.obbFileName);
+                string obbDir = backupDir + "obb/" + m.packageName + "/";
+                FileManager.CreateDirectoryIfNotExisting(obbDir);
+                FileManager.DeleteFileIfExisting(obbDir + m.obbFileName);
+                File.Move(m.tmpPath, obbDir + m.obbFileName);
                 Logger.Log("Moved obb");
                 return;
             }
             // Is apk
-            string packageName = QAVSWebserver.GetAPKPackageName(m.tmpPath);
-            string backupDir = CoreService.coreVars.QAVSBackupDir + packageName + "/" + m.backupName + "/";
-            FileManager.RecreateDirectoryIfExisting(backupDir);
+            FileManager.CreateDirectoryIfNotExisting(backupDir);
+            FileManager.DeleteFileIfExisting(backupDir + "app.apk");
             File.Move(m.tmpPath, backupDir + "app.apk");
+            Logger.Log("Moved apk");
         }
     }
 }

QuestAppVersionSwitcher/WebServer.cs

@@ -1151,11 +1151,6 @@ private void ChangeApp(string packageName)
             QAVSModManager.Update();
         }
 
-        public void ShowWebsite()
-        {
-            throw new NotImplementedException();
-        }
-
         public string GetSHA256OfString(string input)
         {
             return BitConverter.ToString(hasher.ComputeHash(Encoding.UTF8.GetBytes(input))).Replace("-", "");