Fix QAVS crashing on startup if adb output getting fails, add installation of Lightning Launcher as well as updating guide

Author: ComputerElite

DiffCreator/obj/Debug/net6.0/DiffCreator.AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("DiffCreator")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3b28523e168e9e3b15a94c4c931f06f5cf6ae759")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a7e38eb39f068612272f220c93ff04601cfeb33e")]
 [assembly: System.Reflection.AssemblyProductAttribute("DiffCreator")]
 [assembly: System.Reflection.AssemblyTitleAttribute("DiffCreator")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

DiffCreator/obj/Debug/net6.0/DiffCreator.AssemblyInfoInputs.cache

@@ -1 +1 @@
-219524a90bc32984e269bcf9b4381ac3771d7df8ad2c08fb560ea781f7ced5b2
+526d2a99f82c4553c0a172349039e834d0d9945e8d579c1ebd5285a6db2a5e31

DiffCreator/obj/Release/net6.0/DiffCreator.AssemblyInfo.cs

@@ -14,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("DiffCreator")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f7b7155cadcbcfbb5b89a24c52b474aea4dfdc5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a7e38eb39f068612272f220c93ff04601cfeb33e")]
 [assembly: System.Reflection.AssemblyProductAttribute("DiffCreator")]
 [assembly: System.Reflection.AssemblyTitleAttribute("DiffCreator")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

DiffCreator/obj/Release/net6.0/DiffCreator.AssemblyInfoInputs.cache

@@ -1 +1 @@
-b8fbbfcde5e59c97714e0dd5db41650a72cb80f4512222f3d41bf98e5aa67520
+a0f28e8274c2ffadbf476424324d476fdc6c89d144099da1aee85cbadcadff50

QuestAppVersionSwitcher/Adb/AdbWrapper.cs

@@ -84,11 +84,29 @@ public static ExitInfo RunAdbCommand(string arguments)
             }
 
             proc.WaitForExit();
+            string error = "";
+            try
+            {
+                error = proc.StandardError.ReadToEnd();
+            }
+            catch (Exception e)
+            {
+                error = "Internal QAVS error getting standard error: " + e;
+            }
+            string output = "";
+            try
+            {
+                output = proc.StandardOutput.ReadToEnd();
+            }
+            catch (Exception e)
+            {
+                output = "Internal QAVS error getting standard output: " + e;
+            }
             ExitInfo i = new ExitInfo()
             {
                 ExitCode = proc.ExitCode,
-                Error = proc.StandardError.ReadToEnd(),
-                Output = proc.StandardOutput.ReadToEnd()
+                Error = error,
+                Output = output
             };
             Logger.Log("Exit code: " + i.ExitCode + "\n Error: " + i.Error + "\n\n Output: " + i.Output, "AdbWrapper");
 

QuestAppVersionSwitcher/Assets/html/adb.html

@@ -26,11 +26,19 @@ <h1>Quest connected!</h1>
     <p>Your quest is connected via adb. You can return now</p>
     <button onclick="AdbConnected()">Continue</button>
 </div>
+<div class="content hidden" id="launcher">
+    <h1>Prerequisites</h1>
+    <p>Before pairing you have to install Lightning Launcher. For that use the button below. It'll start the download and then initiate the install.</p>
+    <button onclick="Launcher()">Download and install Lightning Launcher</button>
+    <div id="launcherInstall" class="hidden">
+        <h2>Installing Lightning Launcher</h2>
+        Please wait a few seconds until the download completes. If you have any issues, please press the download button again.
+    </div>
+</div>
 <div class="content hidden" id="pair">
     <h1>Pairing</h1>
     <p>Your quest is not connected via adb yet. Input the port and code shown in the wireless adb pairing page.</p>
 
-    <button onclick="settings()">Open android settings</button>
     <input type="number" placeholder="port" id="port">
     <input type="number" placeholder="code" id="code">
     <button onclick="pair()">Pair</button>
@@ -39,22 +47,25 @@ <h2>Guide</h2>
         <img id="guideImage">
         <p id="guideText"></p>
 
-        <button onclick="UpdateGuide(-1)">&lt;</button>
-        <button onclick="UpdateGuide(1)">&gt;</button>
+        <button class="navigationButton" onclick="UpdateGuide(-1)">&lt;</button>
+        <button class="navigationButton" onclick="UpdateGuide(1)">&gt;</button>
     </div>
 </div>
 <div class="content hidden" id="remember">
     <h1>Connect</h1>
     <p>QAVS has successfully paired with your Quest. We will now connect QAVS with your Quest. For that, input the wireless port from the adb wireless settings page.</p>
 
 
-    <button onclick="settings()">Open android settings</button>
     <input type="number" placeholder="wireless port" id="adbport">
     <button onclick="connect()">Connect</button>
+    <br>
+    <b>QAVS may crash while connecting to your Quest. If this happens just restart QAVS. It should be connected afterwards</b>
+    <p>If this happens repeatedly reboot your Quest</p>
     <h2>Guide</h2>
     <div>
         <img src="/images/adb/11.jpg">
         <p>You will find the port in the wireless debugging settings.In this screenshot the port is 46137. Input the one from your settings into the wireless port above and hit connect.</p>
+    
     </div>
 </div>
 <div class="content hidden" id="connecting">
@@ -84,6 +95,9 @@ <h1>Making connecting persistent, please wait a bit</h1>
         <div class="loaderSquare"></div>
     </div>
 </div>
+<br>
+<br>
+<br>
 <a href="/pair">Advanced ui</a>
 <script>
     FirstOpen()
@@ -103,8 +117,11 @@ <h1>Making connecting persistent, please wait a bit</h1>
         img: "/images/adb/0.jpg",
         txt: "Place the window on the left side like in the picture"
     },{
-        img: "/images/adb/1.jpg",
-        txt: "Open the settings on your Quest with the button above"
+        img: "/images/adb/0.1.jpg",
+        txt: "Open Lightning Launcher by opening your Library (1), going to 'Unknown sources' (2) and then opening 'Lightning Launcher' (3)"
+    },{
+        img: "/images/adb/0.2.jpg",
+        txt: "In Lightning Launcher press on 'Apps' (1) and then on 'Android Settings' (2)"
     },{
         img: "/images/adb/2.jpg",
         txt: "Scroll down and press on 'About headset'"
@@ -125,7 +142,7 @@ <h1>Making connecting persistent, please wait a bit</h1>
         txt: "Click on 'Wireless debugging'. Make sure to click into the blank space"
     },{
         img: "/images/adb/8.jpg",
-        txt: "Enable wireless debugging"
+        txt: "Enable wireless debugging and always allow it in your network when prompted"
     },{
         img: "/images/adb/9.jpg",
         txt: "Click on 'Pair device with pairing code'"
@@ -168,10 +185,64 @@ <h1>Making connecting persistent, please wait a bit</h1>
                     // Found devices
                     OpenTab("connected")
                 } else {
+                    InitiatePair()
+                }
+            })
+    }
+    
+    function Launcher() {
+        document.getElementById('launcherInstall').className = ""
+        fetch("/api/adb/downloadlauncher", {method: "POST"}).then(res => {
+            if(res.ok) {
+                InstallationMonitor()
+            } else {
+                alert("Failed to start download. Please try again.")
+                document.getElementById('launcherInstall').className = "hidden"
+            }
+        })
+    }
+    
+    function InstallationMonitor() {
+        let install = setInterval(() => {
+            IsLauncherInstalled().then(isInstalled => {
+                if(isInstalled) {
+                    document.getElementById('launcherInstall').className = "hidden"
+                    clearInterval(install)
                     OpenTab("pair")
                 }
+            }).catch(err => {
+                document.getElementById('launcherInstall').className = "hidden"
+                clearInterval(install)
+                alert("Failed to check if Lightning Launcher is installed. I will assume that it is. If it isn't, install Lightning Launcher manually via SideQuest")
+                OpenTab("pair")
+            })
+        }, 1000)
+    }
+    
+    function IsLauncherInstalled() {
+        return new Promise((resolve, reject) => {
+            fetch("/api/android/installedapps").then(res => res.json()).then(res => {
+                resolve(res.some(app => app.PackageName == "com.threethan.launcher"))
+            }).catch(err => {
+                reject(err)
             })
+        })
     }
+    
+    function InitiatePair() {
+        // Check if lightning launcher is installed
+        IsLauncherInstalled().then(isInstalled => {
+            if(isInstalled) {
+                OpenTab("pair")
+            } else {
+                OpenTab("launcher")
+            }
+        }).catch(err => {
+            alert("Failed to check if Lightning Launcher is installed. I will assume that it is not.")
+            OpenTab("launcher")
+        })
+    }
+    
     function wireless() {
         fetch(`/api/adb/togglewireless`, {
             method: "POST"