Fix game loading.

+ RSL will now automatically choose any Oculus device over devices made by other manufacturers if more than one ADB device is present.
= Fixed Download+Install QUSettings application if QUSettings are set.
= Fixed Pull APK from device.

.vs/VSWorkspaceState.json

@@ -2,5 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
+  "SelectedNode": "\\Sideloader.cs",
   "PreviewInSolutionExplorer": false
 }

ADB.cs

@@ -12,18 +12,20 @@ namespace AndroidSideloader
     class ADB
     {
         static Process adb = new Process();
-        public static string adbFolderPath = Environment.CurrentDirectory + "\\adb";
+        public static string adbFolderPath = "C:\\RSL\\2.1.1\\ADB";
         public static string adbFilePath = adbFolderPath + "\\adb.exe";
         public static string DeviceID = "";
         public static string package = "";
         public static ProcessOutput RunAdbCommandToString(string command)
         {
+            Properties.Settings.Default.ADBFolder = adbFolderPath;
             Properties.Settings.Default.ADBPath = adbFilePath;
             Properties.Settings.Default.Save();
+
             if (DeviceID.Length > 1)
                 command = $" -s {DeviceID} {command}";
             Logger.Log($"Running command {command}");
-            adb.StartInfo.FileName = @adbFilePath;
+            adb.StartInfo.FileName = adbFilePath;
             adb.StartInfo.Arguments = command;
             adb.StartInfo.RedirectStandardError = true;
             adb.StartInfo.RedirectStandardInput = true;
@@ -55,16 +57,22 @@ namespace AndroidSideloader
             }
             else
             adb.WaitForExit();
+            if (error.Contains("ADB_VENDOR_KEYS"))
+            {
+                MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
+                ADB.WakeDevice();
+            }
             Logger.Log(output);
             Logger.Log(error);
             return new ProcessOutput(output, error);
         }
-        public static ProcessOutput RunAdbCommandToStringWOADB(string result, string path)
+        public static ProcessOutput RunAdbCommandToStringWOADB(string result, string file)
         {
             string command = result;
+            Properties.Settings.Default.ADBFolder = adbFolderPath;
             Properties.Settings.Default.ADBPath = adbFilePath;
             Properties.Settings.Default.Save();
-;
+            
 
 
 
@@ -75,7 +83,7 @@ namespace AndroidSideloader
             adb.StartInfo.RedirectStandardOutput = true;
             adb.StartInfo.CreateNoWindow = true;
             adb.StartInfo.UseShellExecute = false;
-            adb.StartInfo.WorkingDirectory = Path.GetDirectoryName(path);
+            adb.StartInfo.WorkingDirectory = Path.GetDirectoryName(file);
             adb.Start();
             adb.StandardInput.WriteLine(command);
             adb.StandardInput.Flush();
@@ -102,16 +110,21 @@ namespace AndroidSideloader
             else
                 adb.WaitForExit();
             if (error.Contains("ADB_VENDOR_KEYS"))
+            {
                 MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
+                ADB.WakeDevice();
+            }
             Logger.Log(output);
             Logger.Log(error);
             return new ProcessOutput(output, error);
         }
 
-        public static ProcessOutput RunCommandToString(string result, string path)
+        public static ProcessOutput RunCommandToString(string result, string file = "")
         {
             string command = result;
-
+            Properties.Settings.Default.ADBFolder = adbFolderPath;
+            Properties.Settings.Default.ADBPath = adbFilePath;
+            Properties.Settings.Default.Save();
 
             Logger.Log($"Running command {command}");
             adb.StartInfo.FileName = @"C:\windows\system32\cmd.exe";
@@ -121,7 +134,7 @@ namespace AndroidSideloader
             adb.StartInfo.RedirectStandardOutput = true;
             adb.StartInfo.CreateNoWindow = true;
             adb.StartInfo.UseShellExecute = false;
-            adb.StartInfo.WorkingDirectory = Path.GetDirectoryName(path);
+            adb.StartInfo.WorkingDirectory = Path.GetDirectoryName(file);
             adb.Start();
             adb.StandardInput.WriteLine(command);
             adb.StandardInput.Flush();
@@ -148,7 +161,10 @@ namespace AndroidSideloader
             else
                 adb.WaitForExit();
             if (error.Contains("ADB_VENDOR_KEYS"))
+            {
                 MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
+                ADB.WakeDevice();
+            }
             Logger.Log(output);
             Logger.Log(error);
             return new ProcessOutput(output, error);
@@ -171,7 +187,6 @@ namespace AndroidSideloader
             long usedSize = 0;
 
             long freeSize = 0;
-            WakeDevice();
             var output = RunAdbCommandToString("shell df").Output.Split('\n');
 
             foreach (string currLine in output)
@@ -209,84 +224,111 @@ namespace AndroidSideloader
             return $"Total space: {String.Format("{0:0.00}", (double)totalSize / 1000)}GB\nUsed space: {String.Format("{0:0.00}", (double)usedSize / 1000)}GB\nFree space: {String.Format("{0:0.00}", (double)freeSize / 1000)}GB";
         }
 
+        private static bool dialogisup = false;
         public static void WakeDevice()
         {
-            if (Properties.Settings.Default.IPAddress.Contains("connect"))
+            string output = RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP").Error;
+            RunAdbCommandToString("Devices");
+            if (output.Contains("found"))
             {
-                RunAdbCommandToString(Properties.Settings.Default.IPAddress);
-                string response = ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress).Output;
-
-                RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
-                if (response.Contains("cannot"))
+                if (Properties.Settings.Default.IPAddress.Contains("connect"))
                 {
-                    DialogResult dialogResult = MessageBox.Show("Either your Quest is idle or you have rebooted the device.\nRSL's wireless ADB will persist on PC reboot but not on Quest reboot.\n\nNOTE: If you haven't rebooted your Quest it may be idle.\n\nTo prevent this press the HOLD button 2x prior to launching RSL. Or\nkeep your Quest plugged into power to keep it permanently \"awake\".\n\nHave you assigned your Quest a static IP in your router configuration?\n\nIf you no longer want to use Wireless ADB or your device was idle please hit CANCEL.", "DEVICE REBOOTED\\IDLE?", MessageBoxButtons.YesNoCancel);
-                    if (dialogResult == DialogResult.Cancel)
-                    {
-                        DialogResult dialogResult2 = MessageBox.Show("Press OK to remove your stored IP address.\nIf your Quest went idle press the HOLD button on the device twice then press CANCEL to reconnect.", "REMOVE STORED IP?", MessageBoxButtons.OKCancel);
-                        if (dialogResult2 == DialogResult.Cancel)
-                            ADB.WakeDevice();
-                        if (dialogResult2 == DialogResult.OK)
+                    ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
+                    string response = ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress).Error;
+
+                    if (response.Contains("cannot"))
+                        if (!dialogisup)
                         {
-                            Properties.Settings.Default.IPAddress = "";
-                            Properties.Settings.Default.Save();
-                            ADB.WakeDevice();
+                            {
+                                dialogisup = true;
+                                DialogResult dialogResult = MessageBox.Show("Either your Quest is idle or you have rebooted the device.\nRSL's wireless ADB will persist on PC reboot but not on Quest reboot.\n\nNOTE: If you haven't rebooted your Quest it may be idle.\n\nTo prevent this press the HOLD button 2x prior to launching RSL. Or\nkeep your Quest plugged into power to keep it permanently \"awake\".\n\nHave you assigned your Quest a static IP in your router configuration?\n\nIf you no longer want to use Wireless ADB or your device was idle please hit CANCEL.", "DEVICE REBOOTED\\IDLE?", MessageBoxButtons.YesNoCancel);
+                                if (dialogResult == DialogResult.Cancel)
+                                {
+                                    DialogResult dialogResult2 = MessageBox.Show("Press OK to remove your stored IP address.\nIf your Quest went idle press the HOLD button on the device twice then press CANCEL to reconnect.", "REMOVE STORED IP?", MessageBoxButtons.OKCancel);
+                                    if (dialogResult2 == DialogResult.Cancel)
+                                        ADB.WakeDevice();
+                                    dialogisup = false;
+                                    if (dialogResult2 == DialogResult.OK)
+                                    {
+                                        Properties.Settings.Default.IPAddress = "";
+                                        Properties.Settings.Default.Save();
+                                        ADB.WakeDevice();
+                                        dialogisup = false;
+                                    }
+
+                                }
+                                else if (dialogResult == DialogResult.Yes)
+                                {
+                                    dialogisup = false;
+                                    MessageBox.Show("Connect your Quest to USB so we can reconnect to your saved IP address!");
+                                    ADB.RunAdbCommandToString("devices");
+                                    Thread.Sleep(250);
+                                    ADB.RunAdbCommandToString("disconnect");
+                                    Thread.Sleep(50);
+                                    ADB.RunAdbCommandToString("connect");
+                                    Thread.Sleep(50);
+                                    ADB.RunAdbCommandToString("tcpip 5555");
+                                    Thread.Sleep(500);
+                                    ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
+
+                                    MessageBox.Show($"Connected! We can now automatically enable wake on wifi. This makes it so Rookie can work wirelessly even if the device has entered \"sleep mode\". This setting is NOT permanent and resets upon Quest reboot just like wireless ADB functionality.\n\n After testing with this setting off and on the difference in battery usage seems nonexistent. We recommend this setting for the majority of users for ease of use purposes. If you click NO you must keep your Quest connected to a charger OR wake your device and then put it back on hold before using Rookie wirelessly. Do you want to enable wake on wifi?", "Enable Wake on Wifi?", MessageBoxButtons.YesNo);
+                                    if (dialogResult == DialogResult.Yes)
+                                    {
+
+                                        ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
+                                        ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
+                                    }
+                                    if (dialogResult == DialogResult.No)
+                                    {
+                                        return;
+                                    }
+                                }
+                                else if (dialogResult == DialogResult.No)
+                                {
+                                    dialogisup = false;
+                                    MessageBox.Show("You must repeat the entire connection process, press OK to begin.", "Reconfigure Wireless ADB", MessageBoxButtons.OK);
+                                    ADB.RunAdbCommandToString("devices");
+                                    ADB.RunAdbCommandToString("tcpip 5555");
+                                    MessageBox.Show("Press OK to get your Quest's local IP address.", "Obtain local IP address", MessageBoxButtons.OK);
+                                    Thread.Sleep(1000);
+                                    string input = ADB.RunAdbCommandToString("shell ip route").Output;
+
+                                    Properties.Settings.Default.WirelessADB = true;
+                                    Properties.Settings.Default.Save();
+                                    string[] strArrayOne = new string[] { "" };
+                                    strArrayOne = input.Split(' ');
+                                    if (strArrayOne[0].Length > 7)
+                                    {
+                                        string IPaddr = strArrayOne[8];
+                                        string IPcmnd = "connect " + IPaddr + ":5555";
+                                        MessageBox.Show($"Your Quest's local IP address is: {IPaddr}\n\nPlease disconnect your Quest then wait 2 seconds.\nOnce it is disconnected hit OK", "", MessageBoxButtons.OK);
+                                        Thread.Sleep(2000);
+                                        ADB.RunAdbCommandToString(IPcmnd);
+                                        Properties.Settings.Default.IPAddress = IPcmnd;
+                                        Properties.Settings.Default.Save();
+
+                                        MessageBox.Show($"Connected! We can now automatically disable the Quest wifi chip from falling asleep. This makes it so Rookie can work wirelessly even if the device has entered \"sleep mode\". This setting is NOT permanent and resets upon Quest reboot, just like wireless ADB functionality.\n\nNOTE: This may cause the device battery to drain while it is in sleep mode at a very slightly increased rate. We recommend this setting for the majority of users for ease of use purposes. If you click NO you must keep your Quest connected to a charger or wake your device and then put it back on hold before using Rookie wirelessly. Do you want us to stop sleep mode from disabling wireless ADB?", "", MessageBoxButtons.YesNo);
+                                        if (dialogResult == DialogResult.Yes)
+                                        {
+
+                                            ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
+                                            ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
+                                        }
+                                    }
+                                }
+                            }
                         }
 
-                    }
-                    else if (dialogResult == DialogResult.Yes)
-                    {
-                        MessageBox.Show("Connect your Quest to USB so we can reconnect to your saved IP address!");
-                        ADB.RunAdbCommandToString("devices");
-                        Thread.Sleep(250);
-                        ADB.RunAdbCommandToString("disconnect");
-                        Thread.Sleep(50);
-                        ADB.RunAdbCommandToString("connect");
-                        Thread.Sleep(50);
-                        ADB.RunAdbCommandToString("tcpip 5555");
-                        Thread.Sleep(500);
-                        ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
-                    }
-                    else if (dialogResult == DialogResult.No)
-                    {
-                        MessageBox.Show("You must repeat the entire connection process, press OK to begin.", "Reconfigure Wireless ADB", MessageBoxButtons.OK);
-                        ADB.RunAdbCommandToString("devices");
-                        ADB.RunAdbCommandToString("tcpip 5555");
-                        MessageBox.Show("Press OK to get your Quest's local IP address.", "Obtain local IP address", MessageBoxButtons.OK);
-                        Thread.Sleep(1000);
-                        string input = ADB.RunAdbCommandToString("shell ip route").Output;
-
-
-                        string[] strArrayOne = new string[] { "" };
-                        strArrayOne = input.Split(' ');
-                        if (strArrayOne[0].Length > 7)
-                        {
-                            string IPaddr = strArrayOne[8];
-                            string IPcmnd = "connect " + IPaddr + ":5555";
-                            MessageBox.Show($"Your Quest's local IP address is: {IPaddr}\n\nPlease disconnect your Quest then wait 2 seconds.\nOnce it is disconnected hit OK", "", MessageBoxButtons.OK);
-                            Thread.Sleep(2000);
-                            ADB.RunAdbCommandToString(IPcmnd);
-                            Properties.Settings.Default.IPAddress = IPcmnd;
-                            Properties.Settings.Default.Save();
-
-                            MessageBox.Show($"Connected!!", "", MessageBoxButtons.OK);
-                            Program.form.ChangeTitlebarToDevice();
-                        }
-
-                      
-                    }
-                    
                 }
             }
-
         }
-        public static ProcessOutput Sideload(string path, string packagename = "")
+
+
+        public static ProcessOutput Sideload(string path = "", string packagename = "")
         {
 
             WakeDevice();
-  
             ProcessOutput ret = new ProcessOutput();
-            package = packagename;
-  
             Program.form.ChangeTitle($"Sideloading {path}");
             ret += RunAdbCommandToString($"install -g -r \"{path}\"");
             string out2 = ret.Output + ret.Error;
@@ -295,7 +337,7 @@ namespace AndroidSideloader
                 string BackupFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups");
                 if (out2.Contains("offline"))
                 {
-                    DialogResult dialogResult2 = MessageBox.Show("Device is offline. Press Yes to reconnect, or if you don't wish to connect and just want to download the game (we suggest unchecking delete games after install from settings menu) then press No.", "Device offline.", MessageBoxButtons.YesNoCancel);
+                    DialogResult dialogResult2 = MessageBox.Show("Device is offline. Press Yes to reconnect, or if you don't wish to connect and just want to download the game (requires unchecking \"Delete games after install\" from settings menu) then press No.", "Device offline.", MessageBoxButtons.YesNoCancel);
                     if (dialogResult2 == DialogResult.Yes)
                         ADB.WakeDevice();
                 }
@@ -337,11 +379,11 @@ namespace AndroidSideloader
             {
 
                        
-                    Program.form.ChangeTitle("Pushing Custom QU s3 Patch JSON.");
-                    if (!Directory.Exists($"/sdcard/android/data/{package}"))
-                        RunAdbCommandToString($"shell mkdir /sdcard/android/data/{package}");
-                    if (!Directory.Exists($"/sdcard/android/data/{package}/private"))
-                        RunAdbCommandToString($"shell mkdir /sdcard/android/data/{package}/private");
+                    Program.form.ChangeTitle("Pushing Custom QU S3 Config.JSON.");
+                    if (!Directory.Exists($"/sdcard/android/data/{packagename}"))
+                        RunAdbCommandToString($"shell mkdir /sdcard/android/data/{packagename}");
+                    if (!Directory.Exists($"/sdcard/android/data/{packagename}/private"))
+                        RunAdbCommandToString($"shell mkdir /sdcard/android/data/{packagename}/private");
 
                     Random r = new Random();
                     int x = r.Next(999999999);
@@ -357,11 +399,11 @@ namespace AndroidSideloader
                     Properties.Settings.Default.QUStringF = $"{{\"user_id\":{sum},\"app_id\":\"{sum2}\",";
                     Properties.Settings.Default.Save();
                     string boff = Properties.Settings.Default.QUStringF + Properties.Settings.Default.QUString;
-                    File.WriteAllText("config.json", boff);
+                    File.WriteAllText($"{Properties.Settings.Default.MainDir}\\config.json", boff);
                     string blank = "";
-                    File.WriteAllText("delete_settings", blank);
-                    ret += ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\delete_settings\" /sdcard/android/data/{package}/private/delete_settings");
-                    ret += ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\config.json\" /sdcard/android/data/{package}/private/config.json");
+                    File.WriteAllText($"{Properties.Settings.Default.MainDir}\\delete_settings", blank);
+                    ret += ADB.RunAdbCommandToString($"push \"{Properties.Settings.Default.MainDir}\\delete_settings\" /sdcard/android/data/{packagename}/private/delete_settings");
+                    ret += ADB.RunAdbCommandToString($"push \"{Properties.Settings.Default.MainDir}\\config.json\" /sdcard/android/data/{packagename}/private/config.json");
             
         }
             Program.form.ChangeTitle("Sideload done");

AndroidSideloader.csproj

@@ -258,6 +258,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="changelog.txt" />
+    <None Include="orangekey.png" />
+    <None Include="greenkey.png" />
     <Content Include="icon.ico" />
   </ItemGroup>
   <ItemGroup>

App.config

@@ -113,6 +113,12 @@
             <setting name="CurrPckg" serializeAs="String">
                 <value />
             </setting>
+            <setting name="ADBFolder" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="WirelessADB" serializeAs="String">
+                <value>False</value>
+            </setting>
         </AndroidSideloader.Properties.Settings>
         <AndroidADB.Sideloader.Properties.Settings>
             <setting name="checkForUpdates" serializeAs="String">

ColumnSort.cs

@@ -30,7 +30,7 @@ public class ListViewColumnSorter : IComparer
         ColumnToSort = 0;
 
         // Initialize the sort order to 'none'
-        OrderOfSort = SortOrder.None;
+        OrderOfSort = SortOrder.Ascending;
 
         // Initialize the CaseInsensitiveComparer object
         ObjectCompare = new CaseInsensitiveComparer();

Program.cs

@@ -8,7 +8,10 @@ namespace AndroidSideloader
     static class Program
     {
         /// <summary>
-        /// The main entry point for the application.
+        /// The main entry point for the appli
+        /// 
+        /// 
+        /// ion.
         /// </summary>
         [STAThread]
         [SecurityPermission(SecurityAction.Demand, Flags = SecurityPermissionFlag.ControlAppDomain)]
@@ -28,7 +31,8 @@ namespace AndroidSideloader
         static void MyHandler(object sender, UnhandledExceptionEventArgs args)
         {
             Exception e = (Exception)args.ExceptionObject;
-            File.WriteAllText(Sideloader.CrashLogPath, $"Message: {e.Message}\nData: {e.Data}\nSource: {e.Source}\nTargetSite: {e.TargetSite}");
+            string date_time = DateTime.UtcNow.ToString("dddd, MMMM dd @ hh:mmtt UTC");
+            File.WriteAllText(Sideloader.CrashLogPath, $"\n\n################\nDate/Time of crash: {date_time}################\n\nMessage: {e.Message}\nData: {e.Data}\nSource: {e.Source}\nTargetSite: {e.TargetSite}");
         }
     }
 }

Properties/Resources.Designer.cs

@@ -59,5 +59,25 @@ namespace AndroidSideloader.Properties {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap greenkey {
+            get {
+                object obj = ResourceManager.GetObject("greenkey", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap orangekey {
+            get {
+                object obj = ResourceManager.GetObject("orangekey", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

Properties/Resources.resx

@@ -117,4 +117,11 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="greenkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\greenkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="orangekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\orangekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace AndroidSideloader.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -430,5 +430,29 @@ namespace AndroidSideloader.Properties {
                 this["CurrPckg"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string ADBFolder {
+            get {
+                return ((string)(this["ADBFolder"]));
+            }
+            set {
+                this["ADBFolder"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool WirelessADB {
+            get {
+                return ((bool)(this["WirelessADB"]));
+            }
+            set {
+                this["WirelessADB"] = value;
+            }
+        }
     }
 }

Properties/Settings.settings

@@ -104,5 +104,11 @@
     <Setting Name="CurrPckg" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ADBFolder" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="WirelessADB" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

QuestForm.cs

@@ -166,9 +166,9 @@ namespace AndroidSideloader
                 Properties.Settings.Default.QUString = $"\"refresh_rate\":{selected},\"eye_texture_width\":{ResBox.Text},\"fov_x\":{FOVx.Text},\"fov_y\":{FOVy.Text},\"username\":\"{UsrBox.Text}\"}}";
                 Properties.Settings.Default.QUStringF = $"{{\"user_id\":{sum},\"app_id\":\"{sum2}\",";
                 Properties.Settings.Default.Save();
-                File.WriteAllText("delete_settings", "");
+                File.WriteAllText($"{Properties.Settings.Default.MainDir}\\delete_settings", "");
                 string boff = Properties.Settings.Default.QUStringF + Properties.Settings.Default.QUString;
-                File.WriteAllText("config.json", boff);
+                File.WriteAllText($"{Properties.Settings.Default.MainDir}\\config.json", boff);
             }
             
 
@@ -282,8 +282,8 @@ namespace AndroidSideloader
         private void questVids_Click(object sender, EventArgs e)
         {
             string path = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-            if (!Directory.Exists($"{path}\\Quest ScreenShots"))
-                Directory.CreateDirectory($"{path}\\Quest ScreenShots");
+            if (!Directory.Exists($"{path}\\Quest VideoShots"))
+                Directory.CreateDirectory($"{path}\\Quest VideoShots");
             MessageBox.Show("Please wait until you get the message that the transfer has finished.");
             ADB.WakeDevice();
             Program.form.ChangeTitle("Pulling files...");

RCLONE.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Text;
 using System.IO;
+using System.Windows.Forms;
 
 namespace AndroidSideloader
 {
@@ -84,7 +85,7 @@ namespace AndroidSideloader
             rclone.WaitForExit();
 
             //if there is one of these errors, we switch the mirrors
-            if (error.Contains("cannot fetch token") || error.Contains("authError") || (error.Contains("quota") && error.Contains("exceeded")))
+            if (error.Contains("cannot fetch token") || error.Contains("authError") || (error.Contains("quota") || error.Contains("exceeded")))
             {
                 string oldRemote = MainForm.currentRemote;
                 try
@@ -102,8 +103,12 @@ namespace AndroidSideloader
                 prcoutput.Output = output;
                 prcoutput.Error = error;
             }
+            if (!prcoutput.Output.Contains("Game Name;Release Name;Release APK Path;Package Name;Version Code;Version Name"))
             Logger.Log($"Rclone error: {error}\nRclone Output: {output}");
-            return prcoutput;
+            if (error.Contains("There is not enough space"))
+                MessageBox.Show("There isn't enough space on your PC to properly install this game. Please have at least 2x the size of the game you are trying to download/install available on the drive where Rookie is installed.", "NOT ENOUGH SPACE");
+                return prcoutput;
+
         }
     }
 }

Sideloader.cs

@@ -34,10 +34,6 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
             }
         }
 
-        //List of all installed package names from connected device
-        public static Dictionary<string, string> InstalledPackages = new Dictionary<string, string>(); //Packagename and Version
-        //public static List<string> InstalledPackageNames = new List<string>();
-
         //Remove folder from device
         public static ProcessOutput RemoveFolder(string path)
         {
@@ -51,18 +47,18 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
         }
 
         //For games that require manual install, like having another folder that isnt an obb
-        public static ProcessOutput RunADBCommandsFromFile(string path)
+        public static ProcessOutput RunADBCommandsFromFile(string file)
         {
             ADB.WakeDevice();
             ProcessOutput output = new ProcessOutput();
-            var commands = File.ReadAllLines(path);
+            var commands = File.ReadAllLines(file);
             foreach (string cmd in commands)
             {
                 if (cmd.Contains("7z.exe"))
                 {
                     Program.form.ChangeTitle($"Running {cmd}");
-                    Logger.Log($"Logging command: {cmd} from file: {path}");
-                    output += ADB.RunCommandToString(cmd, path);
+                    Logger.Log($"Logging command: {cmd} from file: {file}");
+                    output += ADB.RunCommandToString(cmd, file);
                 }
                 if (cmd.StartsWith("adb"))
                 {
@@ -75,8 +71,8 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                     Regex rgx = new Regex(pattern);
                     string result = rgx.Replace(cmd, replacement);
                     Program.form.ChangeTitle($"Running {result}");
-                    Logger.Log($"Logging command: {result} from file: {path}");
-                    output += ADB.RunAdbCommandToStringWOADB(result, path);
+                    Logger.Log($"Logging command: {result} from file: {file}");
+                    output += ADB.RunAdbCommandToStringWOADB(result, file);
                     if (output.Error.Contains("mkdir"))
                         output.Error = "";
                     if (output.Output.Contains("reserved"))
@@ -174,7 +170,6 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
             ProcessOutput output = new ProcessOutput("", "");
 
             string packageName = Sideloader.gameNameToPackageName(GameName);
-
             output = ADB.RunAdbCommandToString("shell pm path " + packageName);
 
             string apkPath = output.Output; //Get apk
@@ -185,14 +180,10 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
 
             output += ADB.RunAdbCommandToString("pull " + apkPath); //pull apk
 
-            string currApkPath = apkPath;
-            while (currApkPath.Contains("/"))
-                currApkPath = currApkPath.Substring(currApkPath.IndexOf("/") + 1);
+            if (File.Exists(Properties.Settings.Default.MainDir + "\\" + packageName + ".apk"))
+                File.Delete(Properties.Settings.Default.MainDir + "\\" + packageName + ".apk");
 
-            if (File.Exists(Environment.CurrentDirectory + "\\" + packageName + ".apk"))
-                File.Delete(Environment.CurrentDirectory + "\\" + packageName + ".apk");
-
-            File.Move(Environment.CurrentDirectory + "\\adb\\" + currApkPath, Environment.CurrentDirectory + "\\" + packageName + ".apk");
+            File.Move(Properties.Settings.Default.ADBFolder + "\\base.apk", Properties.Settings.Default.MainDir + "\\" + packageName + ".apk");
 
             return output;
         }
@@ -201,7 +192,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
         {
             foreach (string[] game in SideloaderRCLONE.games)
             {
-                if (gameName.Equals(game[SideloaderRCLONE.GameNameIndex]))
+                if (gameName.Contains(game[SideloaderRCLONE.GameNameIndex]) || gameName.Contains(game[SideloaderRCLONE.PackageNameIndex]))
                     return game[SideloaderRCLONE.PackageNameIndex];
             }
             return gameName;

Updater.cs

@@ -17,7 +17,11 @@ namespace AndroidSideloader
         private static string RawGitHubUrl;
         private static string GitHubUrl;
 
-        static readonly public string LocalVersion = "2.1HF2";
+<<<<<<< HEAD
+        static readonly public string LocalVersion = "2.1.1HF1";
+=======
+        static readonly public string LocalVersion = "2.1.1";
+>>>>>>> + Added optional Wake on Wifi setting so Wireless ADB will still connect as long as device is not powered off or dead.
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 
@@ -28,9 +32,6 @@ namespace AndroidSideloader
             try
             {
                 currentVersion = client.GetStringAsync($"{RawGitHubUrl}/master/version").Result;
-                if (currentVersion.Length > LocalVersion.Length)
-                    currentVersion = currentVersion.Remove(currentVersion.Length - 1);
-                currentVersion = currentVersion.Replace("\n", "");
                 changelog = client.GetStringAsync($"{RawGitHubUrl}/master/changelog.txt").Result;
                 client.Dispose();
             }
@@ -41,8 +42,8 @@ namespace AndroidSideloader
         //Call this to ask the user if they want to update
         public static void Update()
         {
-            RawGitHubUrl = $"https://raw.githubusercontent.com/{Repostory}";
-            GitHubUrl = $"https://github.com/{Repostory}";
+            RawGitHubUrl = $"https://raw.githubusercontent.com/nerdunit/androidsideloader";
+            GitHubUrl = $"https://github.com/nerdunit/androidsideloader";
             if (IsUpdateAvailable())
                 doUpdate();
         }

Utilities/Logger.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 
 namespace AndroidSideloader
 {

changelog.txt

@@ -1,8 +1,118 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.1.1HF1
+
++ Prepended each line of debuglog.txt with Hour and Minute in UTC time. 
++ Added DATE + TIME to Debuglog.txt each time user launches RSL.
++ Added DATE + TIME to CrashLog.txt each time program crashes.
+= Simplified crashlog.txt delete message on boot.
+= Fixed unhandled exception crashes (I hope).
+= Fixed rare QU settings error.
+= Cleaned up code order.
+= Cleaned up Install.txt logic.
+= Other bugfixes.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDl8XUACgkQx/Rql1Vo
+czfl3w//QQmRaVj8IGyevA3fKBB3jdKVZDCbKrRsxTS8MfvVxLeCczDwCJemmu1u
+oF+8TXj0knOLA2FmgVtJAuBjTQLzlL3KGFdZjctfV+7II+LnwvNO01agxfVITAUh
+nivRDsGqu7p3pDQly3dAOAjuUNl9qEy5iI3g1bVHUNK0qk+zI1DFi2AP2q3309df
+O4bE14erPzDz+ELY1PA5oki7T5CyKUakcoYsA6ee4la1ClE2gYBmZym0NdlCu2ay
+9iq+K47D7yHi2J5lIks/RHvmWQwAnrii9J6Ftcl+AsB3DzT8nPgDUx6empDzKgN6
+8XhjF4sxGWVRbxUZe00f5QGLGS0FZjwCCXS2TjZJ3s9+mdHqQuWybYG+oO0Nk6XP
+IOWXsvzMoyo8c8S7oatUuOAPaIx94BdiVS9WOJvQLEk7/HLzsT2jafJBacb/mM2y
+HmLi4VFjhjxvptek+nCFgtiA+zt79/DX11luSfFNA8P2jdV7ECwRMebg0rc05SI3
+DKD35f00yAsIDt/GJjP3PhiUgmlBwkmJ7GiQPNRwif6J7t3LRootA03FWTI3kHbM
+MdNkI0QV6qOZFK+j6T/Xwt8J3EhJR0MNFUuzKg+9pfzeGAPiPXaCbr6BajgPiEPe
+z1m2udFCNYt+bYKvbxc1ALpfkKiegwlh40IF/eAz3iPH4lLOlRs=
+=dL8Y
+-----END PGP SIGNATURE-----
+
+
+
+
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
 RSL 2.1.1
 
++ Added optional Wake on Wifi setting so Wireless ADB will still connect as long as device is not powered off or dead.
++ RSL will now automatically choose any Oculus device over devices made by other manufacturers if more than one ADB device is present.
+= Fixed Download+Install QUSettings application if QUSettings are set.
+= Fixed Pull APK from device.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDjcnQACgkQx/Rql1Vo
+czchqg//WStjc1ANHJK1P06ormJ4ArZFA70UkL0Xd7QUcwJhEiR2/uIIHpOCeCdZ
+ymf6fvsqcyMkAMMq2YA1sNd5fPTFgcaqWZhkir+TywPBfrpcMJYP2lcJGXuhcmjm
+GJo4uymOjci9SBrjb7o8Z5q3cxInRPLfgksgRVN+b3Y965yqETm0OcSXBrCuDyXV
+SqgAJzAFNqElE91LRtz3BqOJ8eNXmEbmC9iSFnllwC9fSYwDefNkIRAVfmD5inqs
+acSW/6URwF4xnF578mnHfdhKlhROqt7XJ/dqIrrh1o0/kV7VbOR4J7rq8vD1nHrZ
+uOAZ+zBKnk37Px61F4XWtUmX0MDHoTuJChAZqKzdZkIUy9Dq/l5asMFufGaGLrHa
+OGjuXNQOTGzSKzp6SNsrU+BkBAJDW4NBWrgacC9PqgE+uZSgedreDZb86UWtZ6ZA
+MR7MFiqaKBGx0GMfbO/JWu/REa9GkdCghwbSKrnPCIK2wsY7zECFflmIaf/BQWzw
+p6hicDZc5053Cu+ZHPy8AiKbv+3FB5AWiujYbl/QkBifoEL03tHepCREAHMD6MBn
+OqgnRU2gwtqke2FSnThyx1qgnnXLLi2M4we171DreBziF9DE23W/hcE+RU3WtucR
+QflQ1p4c5o1q8B2QDkDSjcsCfCXRnfQ52YRv0N7cdKZ9M56GAF0=
+=KqGL
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+Update RSL2.1HF5
+
+Fixed ADB path for usernames containing spaces. ADB now located at c:\RSL\VersionNumber\ADB
+
+- -HarryEffingPotter-
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDdNvsACgkQx/Rql1Vo
+czdIWQ/+OvvchZOuwMZJvd6d/N4WmBUPKm3TzyiF5JM/STLEbLIHB1p6LQg+6J3K
+3d9x3mQmu/gMHMumsfmuOuHHI7OOs9CLOVY2UFm7CqTnDf7iCxl8+6/iQw48yfj9
+63qwUKZdLueRX9IqtcV2MwZJP7eKdZmtv6ALyRbjWmo2fgbm/Fs1U+TfGnlY7qLg
+wIascv5DuKRyHvRzlgdn6OqmewWTxHDOTwCTjodROIK9guCELNYhEWv/TtgMldv9
+gz1Lr8KZOcxNltpvstJgdbeFy61LK67su0rKZHsGMu4x0hDe4YOyjyMDtXrVJ0VH
+SJBqDgSKD3HE/MNYkCWusqs7np2XKXC8hP6nm2QO9zM44d+UWDfrJbwvvw6QUoez
+Iqk/PskC3sF7kWAv4O+LRmLDlrHD2RG5TkkE4ohiIi4D4VaNEx4QyVf6INN+A9xd
+IxcvXC9QkFwffUD93cThEdLNRnrnzZSsUFMRh3XrvPbq2wfvWjqZX1EGfD7ug0Mf
+r9uPX4RdILvsXeybefiiwLiw3UNMJtUlaKDvqIit5S78BIP6DY+dGnMMRIQJa1vd
+XBPnIHyifzvl1nyYd6TWCFRuOzZLYirv4Ug6xS1/KzyURXIz2P0EEhDURJAR/q+M
+ZmqSO2eQo64B7Dfa9oRLKkZRfhWFgtYA9QKm9ei7tOPbnJ+2718=
+=o5Nr
+-----END PGP SIGNATURE-----
+
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.1HF4
+
+= Moved ADB files to AppData\Roaming\RSL to fix compatibility issues across the board.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDa9rQACgkQx/Rql1Vo
+czeiYQ//X6e3DD51Kgta/omu0fVtPM4lxt+P/H5ij1xbNPmoaL7w+QvNeFqVLPs0
+T8btbEkDT7pisOHQtHFKENs4G0Sck0RkI0jVNu1lYIT67tmTYyFGP4jOxopktmNE
+uydmI8g+8UkuTPYIKpkYJUOrWT1u4IV0SoBsdERYU7qRZmvCqWgwqdcs4R6wAdm0
+FNqWRbUo/LhFw1rQicny4vL7w6rf7PvAksWifqbl1KfBFAchf4cZ3+YKeyO4V2Ym
+7LcNgVGaSuPCr5dKmVr31B0kU0XrV8KPpKwgoIOym8eH8PNuaj3elwbndqYZ95fB
+xNFluF9z9qejiIkYM9UDSoeNEfeJaUwIfgb1WI4w+BdlTWaYZfsG+DF+VOBvSU/h
+YP1ucGrqCu2lLxcIS5ffNd7dTjS22D2x2rErqXGl+ETgqgVHK9NU9Bd02VVyP171
+Ryq/JRd9tvFknAG6YViVADJDzKdnuwFYeo/T5wgt8P7GtzVZWmZbur6crXK454IH
+TkyLn9XFbJneGPxjLNm4VwCR0XWFmhAsE+CfRz52hL18RAxyeohWq7RBTt+d49t9
+eOhTTzOHoWgroOVTV793r+FLdc4nYDhLXRm6I65qhvQhEPCqZDIA1xuvzPbSectb
+VNNRuPmhxDgtevFFsU/sX8xOv8pKi6naW8N6jobXPavwegABCEg=
+=61BS
+-----END PGP SIGNATURE-----
+
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.1HF3
+
 = Fixed QUSettings not working issue.(unused fields in QUSettings MUST have 0's in them or it will not work, reset/clear all fields button now reflect this.)
 = Fixed Uninstall auto-save-backup
 = Fixed Install.txt automation messages.

version

@@ -1 +1 @@
-v2.1.2
+2.1.1HF2