Fix modding of backups, fix qavs inject script to display stuff again

Author: ComputerElite

QuestAppVersionSwitcher/Assets/html/qavs_inject.js

@@ -66,11 +66,11 @@
                 var errors = operations.filter(x => x.type == QAVSError);
 
                 var html = `
-                ${downloadingMods.length > 0 ? `<b>${downloadingMods.length}</b> mod(s) downloading<br>` : ``}
-                ${queuedMods.length > 0 ? `<b>${queuedMods.length}</b> mod(s) queued for install<br>` : ``}
-                ${installingMods.length > 0 ? `<b>${installingMods.length}</b> mod(s) installing<br>` : ``}
-                ${downloadingDependencies.length > 0 ? `<b>${downloadingDependencies.length}</b> dependencies downloading<br>` : ``}
-                ${errors.length > 0 ? `<div style="color: #EE0000;"><b>${errors.length}</b> error(s), more info in <a href="http://127.0.0.1:${qavsPort}?tab=mods">installed mods tab</a></div><br>` : ``}
+                ${downloadingMods.length > 0 ? `${downloadingMods.length} mod(s) downloading\n` : ``}
+                ${queuedMods.length > 0 ? `${queuedMods.length} mod(s) queued for install\n` : ``}
+                ${installingMods.length > 0 ? `${installingMods.length} mod(s) installing\n` : ``}
+                ${downloadingDependencies.length > 0 ? `${downloadingDependencies.length} dependencies downloading\n` : ``}
+                ${errors.length > 0 ? `${errors.length}</b> error(s), more info in <a href="http://127.0.0.1:${qavsPort}?tab=mods">installed mods tab</a>` : ``}
             `;
                 if(html.trim()) {
                     QAVSsomethingWasRunning = true
@@ -110,7 +110,7 @@
     }
 
 // Modify sign in options on auth.meta.com
-    if(location.host.contains("auth.meta.com")) {
+    if(location.host.includes("auth.meta.com")) {
         console.log("auth.meta.com")
         if(location.href.startsWith("https://auth.meta.com/register/facebook/")) {
             // Registering with facebook shouldn't be happening on headset

QuestAppVersionSwitcher/Assets/html/script.js

@@ -303,7 +303,7 @@ function UpdatePatchingStatus() {
         return;
     }
     patchStatus.innerHTML = `Loading<br><br>${squareLoader}`
-    var backupExtra = "?package=" + config.currentApp + "&backupName=" + backupToPatch
+    var backupExtra = "?package=" + config.currentApp + "&backup=" + backupToPatch
     fetch("/api/patching/getmodstatus" + (backupToPatch ? backupExtra : "")).then(res => {
         res.json().then(res => {
             UpdateVersion(res.version)

QuestAppVersionSwitcher/FolderPermission.cs

@@ -79,7 +79,6 @@ public static void Copy(string from, string to)
             }
             try
             {
-                Logger.Log("Copying " + from + " to " + to);
                 Stream file = GetOutputStream(to);
 
                 if (file.CanWrite)
@@ -101,7 +100,6 @@ public static void Copy(DocumentFile source, string to)
         {
             try
             {
-                Logger.Log("Copying " + source.Name + " to " + to);
                 Stream file = System.IO.File.OpenWrite(to);
 
                 if (file.CanWrite)
@@ -123,7 +121,6 @@ public static void Copy(string source, DocumentFile to)
         {
             try
             {
-                Logger.Log("Copying " + source + " to " + to);
                 Stream file = AndroidCore.context.ContentResolver.OpenOutputStream(to.Uri);
 
                 if (file.CanWrite)
@@ -273,36 +270,29 @@ public static void DirectoryCopy(string sourceDirName, string destDirName)
 
         public static void InternalDirectoryCopy(string source, DocumentFile destDir)
         {
-            Logger.Log("Starting directory copy: string, DocumentFile");
             if (destDir == null) return;
-            Logger.Log(source + " -> " + destDir.Uri);
 
             // Delete all files and directories in destination directory
             foreach (DocumentFile f in destDir.ListFiles())
             {
                 f.Delete();
             }
 
-            Logger.Log("Cleared dest");
 
             DirectoryInfo dir = new DirectoryInfo(source);
-            Logger.Log("Got dir info");
 
             // Get the files in the directory and copy them to the new location.
             foreach (FileInfo file in dir.GetFiles())
             {
                 try
                 {
-                    Logger.Log("Copying " + file.Name);
                     Copy(file.FullName, destDir.CreateFile("application/octet-stream", file.Name));
                 }
                 catch (Exception e) { Logger.Log("Error copying " + file.Name + ": " + e.ToString(), LoggingType.Error); }
             }
 
-            Logger.Log("Copied all files");
             foreach (DirectoryInfo subdir in dir.GetDirectories())
             {
-                Logger.Log("Continuing with subdir " + subdir.Name);
                 InternalDirectoryCopy(subdir.FullName, destDir.CreateDirectory(subdir.Name));
             }
         }

QuestAppVersionSwitcher/OculusGraphQLApiLib/Folders/OculusFolder.cs

@@ -19,6 +19,5 @@ public static string GetManifestPath(string oculusFolder, string canonicalName)
         {
             return oculusFolder + Path.DirectorySeparatorChar + "Manifests" + Path.DirectorySeparatorChar + canonicalName + ".json";
         }
-        
     }
 }

QuestAppVersionSwitcher/PatchingManager.cs

@@ -291,7 +291,7 @@ public static PatchingStatus GetPatchingStatus(string app = null)
         public static PatchingStatus GetPatchingStatusOfBackup(string package, string backupName)
         {
             string backupDir = CoreService.coreVars.QAVSBackupDir + package + "/" + backupName + "/";
-            ZipArchive apk = ZipFile.OpenRead(AndroidService.FindAPKLocation(backupDir + "app.apk"));
+            ZipArchive apk = ZipFile.OpenRead(backupDir + "app.apk");
             PatchingStatus s =  GetPatchingStatus(apk);
             apk.Dispose();
             return s;

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.20" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="109">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.30" package="com.ComputerElite.questappversionswitcher" android:installLocation="preferExternal" android:versionCode="110">
 	<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.29.0")]
-[assembly: AssemblyFileVersion("1.13.20.0")]
+[assembly: AssemblyVersion("1.13.30.0")]
+[assembly: AssemblyFileVersion("1.13.30.0")]