2.1.1HF1

This reverts commit aba08c9ec70941d0c9f1173bd50c00715c48dc43.

.gitignore

@@ -16,3 +16,6 @@ installedPackages.json
 AndroidSideloader.csproj.user
 AndroidSideloader.csproj.user
 AndroidSideloader.csproj.user
+/AndroidSideloader v2.1.exe
+/crashlog.txt
+/debuglog.txt

.vs/VSWorkspaceState.json

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

ADB.cs

@@ -12,17 +12,18 @@ namespace AndroidSideloader
     class ADB
     {
         static Process adb = new Process();
-        public static string adbFolderPath = Environment.CurrentDirectory + "\\adb";
+        public static string adbFolderPath = "C:\\RSL\\2.14HF5\\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.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;
@@ -30,7 +31,6 @@ namespace AndroidSideloader
             adb.StartInfo.CreateNoWindow = true;
             adb.StartInfo.UseShellExecute = false;
             adb.StartInfo.WorkingDirectory = adbFolderPath;
-
             adb.Start();
             adb.StandardInput.WriteLine(command);
             adb.StandardInput.Flush();
@@ -40,12 +40,20 @@ namespace AndroidSideloader
             string error = "";
 
             try
-            { 
+            {
                 output = adb.StandardOutput.ReadToEnd();
                 error = adb.StandardError.ReadToEnd();
             }
             catch { }
-
+            if (command.Contains("connect"))
+            {
+                bool graceful = adb.WaitForExit(3000);  //Wait 3 secs.
+                if (!graceful)
+                {
+                    adb.Kill();
+                }
+            }
+            else
             adb.WaitForExit();
             Logger.Log(output);
             Logger.Log(error);
@@ -53,10 +61,12 @@ namespace AndroidSideloader
         }
         public static ProcessOutput RunAdbCommandToStringWOADB(string result, string path)
         {
-
             string command = result;
-            if (DeviceID.Length > 1)
-                command = $"{command}";
+            Properties.Settings.Default.ADBPath = adbFilePath;
+            Properties.Settings.Default.Save();
+;
+
+
 
             Logger.Log($"Running command {command}");
             adb.StartInfo.FileName = "cmd.exe";
@@ -77,19 +87,75 @@ namespace AndroidSideloader
 
             try
             {
-               output += adb.StandardOutput.ReadToEnd();
-               error += adb.StandardError.ReadToEnd();
+                output += adb.StandardOutput.ReadToEnd();
+                error += adb.StandardError.ReadToEnd();
             }
             catch { }
+            if (command.Contains("connect"))
+            {
+                bool graceful = adb.WaitForExit(3000); 
+                if (!graceful)
+                {
+                    adb.Kill();
+                }
+            }
+            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.");
+            Logger.Log(output);
+            Logger.Log(error);
+            return new ProcessOutput(output, error);
+        }
 
-            adb.WaitForExit();
+        public static ProcessOutput RunCommandToString(string result, string path)
+        {
+            string command = result;
+
+
+            Logger.Log($"Running command {command}");
+            adb.StartInfo.FileName = @"C:\windows\system32\cmd.exe";
+            adb.StartInfo.Arguments = command;
+            adb.StartInfo.RedirectStandardError = true;
+            adb.StartInfo.RedirectStandardInput = true;
+            adb.StartInfo.RedirectStandardOutput = true;
+            adb.StartInfo.CreateNoWindow = true;
+            adb.StartInfo.UseShellExecute = false;
+            adb.StartInfo.WorkingDirectory = Path.GetDirectoryName(path);
+            adb.Start();
+            adb.StandardInput.WriteLine(command);
+            adb.StandardInput.Flush();
+            adb.StandardInput.Close();
+
+
+            string output = "";
+            string error = "";
+
+            try
+            {
+                output += adb.StandardOutput.ReadToEnd();
+                error += adb.StandardError.ReadToEnd();
+            }
+            catch { }
+            if (command.Contains("connect"))
+            {
+                bool graceful = adb.WaitForExit(3000);
+                if (!graceful)
+                {
+                    adb.Kill();
+                }
+            }
+            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.");
             Logger.Log(output);
             Logger.Log(error);
             return new ProcessOutput(output, error);
         }
 
 
-            public static ProcessOutput UninstallPackage(string package)
+        public static ProcessOutput UninstallPackage(string package)
         {
             WakeDevice();
             ProcessOutput output = new ProcessOutput("", "");
@@ -105,7 +171,6 @@ namespace AndroidSideloader
             long usedSize = 0;
 
             long freeSize = 0;
-            WakeDevice();
             var output = RunAdbCommandToString("shell df").Output.Split('\n');
 
             foreach (string currLine in output)
@@ -145,18 +210,30 @@ namespace AndroidSideloader
 
         public static void WakeDevice()
         {
-            if (!string.IsNullOrEmpty(Properties.Settings.Default.IPAddress))
+            if (Properties.Settings.Default.IPAddress.Contains("connect"))
             {
-                ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
+                RunAdbCommandToString(Properties.Settings.Default.IPAddress);
                 string response = ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress).Output;
-                if (response.Contains("refused"))
+
+                RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
+                if (response.Contains("cannot"))
                 {
-                    DialogResult dialogResult = MessageBox.Show("It seems you have rebooted your Quest, Rookie's wireless ADB will persist past PC reboot, but not for Quest reboot.\n\nHave you assigned your Quest a static IP in your router configuration? If you no longer want to use Wireless ADB just hit cancel!", "DEVICE WAS REBOOTED", MessageBoxButtons.YesNoCancel);
+                    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)
-                        return;
-                    if (dialogResult == DialogResult.Yes)
                     {
-                        ADB.WakeDevice();
+                        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)
+                        {
+                            Properties.Settings.Default.IPAddress = "";
+                            Properties.Settings.Default.Save();
+                            ADB.WakeDevice();
+                        }
+
+                    }
+                    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);
@@ -168,9 +245,8 @@ namespace AndroidSideloader
                         Thread.Sleep(500);
                         ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
                     }
-                    if (dialogResult == DialogResult.No)
+                    else if (dialogResult == DialogResult.No)
                     {
-                        ADB.WakeDevice();
                         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");
@@ -183,7 +259,6 @@ namespace AndroidSideloader
                         strArrayOne = input.Split(' ');
                         if (strArrayOne[0].Length > 7)
                         {
-                            ADB.WakeDevice();
                             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);
@@ -195,16 +270,13 @@ namespace AndroidSideloader
                             MessageBox.Show($"Connected!!", "", MessageBoxButtons.OK);
                             Program.form.ChangeTitlebarToDevice();
                         }
-                        else
-                        {
-                            MessageBox.Show("No device connected!");
-                        }
 
+                      
                     }
-
+                    
                 }
             }
-            RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
+
         }
         public static ProcessOutput Sideload(string path, string packagename = "")
         {
@@ -212,6 +284,7 @@ namespace AndroidSideloader
             WakeDevice();
   
             ProcessOutput ret = new ProcessOutput();
+            package = packagename;
   
             Program.form.ChangeTitle($"Sideloading {path}");
             ret += RunAdbCommandToString($"install -g -r \"{path}\"");
@@ -231,7 +304,7 @@ namespace AndroidSideloader
                     ret.Output = string.Empty;
 
 
-                    MessageBox.Show($"In-place upgrade for {packagename} failed.  We will need to upgrade by uninstalling, and keeping savedata isn't guaranteed.  Continue?", "UPGRADE FAILED!", MessageBoxButtons.OKCancel);
+                    MessageBox.Show($"In place upgrade for {packagename} failed.  We will need to upgrade by uninstalling, and keeping savedata isn't guaranteed.  Continue?", "UPGRADE FAILED!", MessageBoxButtons.OKCancel);
 
                     string date_str = DateTime.Today.ToString("yyyy.MM.dd");
                     string CurrBackups = Path.Combine(BackupFolder, date_str);
@@ -240,12 +313,9 @@ namespace AndroidSideloader
                     MessageBox.Show($"Searching for save files...", "Searching!", MessageBoxButtons.OK);
                     if (Directory.Exists($"/sdcard/Android/data/{packagename}"))
                     {
-                        MessageBox.Show($"Trying to backup save to Documents\\Rookie Backups\\{date_str}(year.month.date)\\{packagename}\\data", "Save files found", MessageBoxButtons.OK);
-
+                        MessageBox.Show($"Trying to backup save to Documents\\Rookie Backups\\{date_str}(YYYY.MM.DD)\\{packagename}", "Save files found", MessageBoxButtons.OK);
                         Directory.CreateDirectory(CurrBackups);
-                        String CurrbackupPaths = CurrBackups + "\\" + packagename + "\\data";
-                        Directory.CreateDirectory(CurrbackupPaths);
-                        ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrbackupPaths}\"");
+                        ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrBackups}\"");
                     }
                     else
                     {
@@ -256,7 +326,7 @@ namespace AndroidSideloader
                         }
                     }
                     ADB.WakeDevice();
-                    ret += ADB.RunAdbCommandToString("shell pm uninstall " + packagename);
+                    ret += ADB.RunAdbCommandToString("shell pm uninstall " + package);
                     ret += RunAdbCommandToString($"install -g -r \"{path}\"");
                     return ret;
                 }
@@ -264,33 +334,35 @@ namespace AndroidSideloader
             }
             if (File.Exists($"{Properties.Settings.Default.MainDir}\\Config.Json"))
             {
-                Program.form.ChangeTitle("Pushing Custom QU s3 Patch JSON.");
 
-                RunAdbCommandToString($"shell mkdir /sdcard/android/data/{packagename}");
-                RunAdbCommandToString($"shell mkdir /sdcard/android/data/{packagename}/private");
-                
+                       
+                    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");
 
-                Random r = new Random();
-                int x = r.Next(999999999);
-                int y = r.Next(9999999);
+                    Random r = new Random();
+                    int x = r.Next(999999999);
+                    int y = r.Next(9999999);
 
-                var sum = ((long)y * (long)1000000000) + (long)x;
+                    var sum = ((long)y * (long)1000000000) + (long)x;
 
-                int x2 = r.Next(999999999);
-                int y2 = r.Next(9999999);
+                    int x2 = r.Next(999999999);
+                    int y2 = r.Next(9999999);
 
-                var sum2 = ((long)y2 * (long)1000000000) + (long)x2;
-                ADB.WakeDevice();
-                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);
-                string blank = "";
-                File.WriteAllText("delete_settings", blank);
-                ret += ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\delete_settings\" /sdcard/android/data/{packagename}/private/");
-                ret += ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\config.json\" /sdcard/android/data/{packagename}/private/");
-
-            }
+                    var sum2 = ((long)y2 * (long)1000000000) + (long)x2;
+                    ADB.WakeDevice();
+                    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);
+                    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");
+            
+        }
             Program.form.ChangeTitle("Sideload done");
             return ret;
         }

App.config

@@ -27,7 +27,7 @@
                 <value>True</value>
             </setting>
             <setting name="userJsonOnGameInstall" serializeAs="String">
-                <value>True</value>
+                <value>False</value>
             </setting>
             <setting name="CallUpgrade" serializeAs="String">
                 <value>True</value>
@@ -51,7 +51,7 @@
                 <value>White</value>
             </setting>
             <setting name="FontStyle" serializeAs="String">
-                <value>Microsoft Sans Serif, 8.5pt</value>
+                <value>Microsoft Sans Serif, 9.5pt</value>
             </setting>
             <setting name="BackPicturePath" serializeAs="String">
                 <value />
@@ -84,19 +84,19 @@
                 <value />
             </setting>
             <setting name="QUhz" serializeAs="String">
-                <value />
+                <value>0</value>
             </setting>
             <setting name="QUres" serializeAs="String">
-                <value />
+                <value>0</value>
             </setting>
             <setting name="QUy" serializeAs="String">
-                <value />
+                <value>0</value>
             </setting>
             <setting name="QUx" serializeAs="String">
-                <value />
+                <value>0</value>
             </setting>
             <setting name="QUname" serializeAs="String">
-                <value />
+                <value>Change Me</value>
             </setting>
             <setting name="QUString" serializeAs="String">
                 <value />
@@ -110,6 +110,9 @@
             <setting name="delsh" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="CurrPckg" serializeAs="String">
+                <value />
+            </setting>
         </AndroidSideloader.Properties.Settings>
         <AndroidADB.Sideloader.Properties.Settings>
             <setting name="checkForUpdates" serializeAs="String">

MainForm.Designer.cs

@@ -97,7 +97,7 @@
             this.m_combo.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.m_combo.Location = new System.Drawing.Point(227, 8);
             this.m_combo.Name = "m_combo";
-            this.m_combo.Size = new System.Drawing.Size(745, 21);
+            this.m_combo.Size = new System.Drawing.Size(745, 24);
             this.m_combo.TabIndex = 0;
             this.m_combo.Text = "Select an app to uninstall...";
             // 
@@ -341,7 +341,7 @@
             this.panel1.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2);
+            this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(218, 775);
             this.panel1.TabIndex = 73;
@@ -373,6 +373,7 @@
             // aboutBtn
             // 
             this.aboutBtn.BackColor = global::AndroidSideloader.Properties.Settings.Default.ButtonColor;
+            this.aboutBtn.Cursor = System.Windows.Forms.Cursors.Hand;
             this.aboutBtn.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.aboutBtn.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.aboutBtn.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -423,7 +424,7 @@
             this.otherContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.otherContainer.Dock = System.Windows.Forms.DockStyle.Top;
             this.otherContainer.Location = new System.Drawing.Point(0, 401);
-            this.otherContainer.Margin = new System.Windows.Forms.Padding(2);
+            this.otherContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.otherContainer.Name = "otherContainer";
             this.otherContainer.Size = new System.Drawing.Size(218, 167);
             this.otherContainer.TabIndex = 80;
@@ -567,7 +568,7 @@
             this.otherDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.otherDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.otherDrop.Location = new System.Drawing.Point(0, 373);
-            this.otherDrop.Margin = new System.Windows.Forms.Padding(2);
+            this.otherDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.otherDrop.Name = "otherDrop";
             this.otherDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
             this.otherDrop.Size = new System.Drawing.Size(218, 28);
@@ -585,7 +586,7 @@
             this.backupContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.backupContainer.Dock = System.Windows.Forms.DockStyle.Top;
             this.backupContainer.Location = new System.Drawing.Point(0, 313);
-            this.backupContainer.Margin = new System.Windows.Forms.Padding(2);
+            this.backupContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.backupContainer.Name = "backupContainer";
             this.backupContainer.Size = new System.Drawing.Size(218, 60);
             this.backupContainer.TabIndex = 76;
@@ -603,7 +604,7 @@
             this.backupDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.backupDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.backupDrop.Location = new System.Drawing.Point(0, 285);
-            this.backupDrop.Margin = new System.Windows.Forms.Padding(2);
+            this.backupDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.backupDrop.Name = "backupDrop";
             this.backupDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
             this.backupDrop.Size = new System.Drawing.Size(218, 28);
@@ -627,7 +628,7 @@
             this.sideloadContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.sideloadContainer.Dock = System.Windows.Forms.DockStyle.Top;
             this.sideloadContainer.Location = new System.Drawing.Point(0, 56);
-            this.sideloadContainer.Margin = new System.Windows.Forms.Padding(2);
+            this.sideloadContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sideloadContainer.Name = "sideloadContainer";
             this.sideloadContainer.Size = new System.Drawing.Size(218, 229);
             this.sideloadContainer.TabIndex = 74;
@@ -687,7 +688,7 @@
             this.sideloadDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.sideloadDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.sideloadDrop.Location = new System.Drawing.Point(0, 28);
-            this.sideloadDrop.Margin = new System.Windows.Forms.Padding(2);
+            this.sideloadDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sideloadDrop.Name = "sideloadDrop";
             this.sideloadDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
             this.sideloadDrop.Size = new System.Drawing.Size(218, 28);
@@ -707,7 +708,7 @@
             this.diskLabel.Location = new System.Drawing.Point(13, 654);
             this.diskLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.diskLabel.Name = "diskLabel";
-            this.diskLabel.Size = new System.Drawing.Size(65, 15);
+            this.diskLabel.Size = new System.Drawing.Size(72, 16);
             this.diskLabel.TabIndex = 7;
             this.diskLabel.Text = "Disk Label";
             // 
@@ -721,7 +722,7 @@
             this.speedLabel.Location = new System.Drawing.Point(12, 733);
             this.speedLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.speedLabel.Name = "speedLabel";
-            this.speedLabel.Size = new System.Drawing.Size(124, 15);
+            this.speedLabel.Size = new System.Drawing.Size(135, 16);
             this.speedLabel.TabIndex = 76;
             this.speedLabel.Text = "DLS: Speed in MBPS";
             // 
@@ -735,7 +736,7 @@
             this.etaLabel.Location = new System.Drawing.Point(12, 751);
             this.etaLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.etaLabel.Name = "etaLabel";
-            this.etaLabel.Size = new System.Drawing.Size(120, 15);
+            this.etaLabel.Size = new System.Drawing.Size(131, 16);
             this.etaLabel.TabIndex = 75;
             this.etaLabel.Text = "ETA: HH:MM:SS Left";
             // 
@@ -768,10 +769,11 @@
             this.gamesQueListBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.gamesQueListBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.gamesQueListBox.FormattingEnabled = true;
-            this.gamesQueListBox.Location = new System.Drawing.Point(601, 529);
-            this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(2);
+            this.gamesQueListBox.ItemHeight = 16;
+            this.gamesQueListBox.Location = new System.Drawing.Point(601, 530);
+            this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gamesQueListBox.Name = "gamesQueListBox";
-            this.gamesQueListBox.Size = new System.Drawing.Size(372, 106);
+            this.gamesQueListBox.Size = new System.Drawing.Size(372, 114);
             this.gamesQueListBox.TabIndex = 9;
             this.gamesQueListBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.gamesQueListBox_MouseClick);
             // 
@@ -788,9 +790,9 @@
             this.devicesComboBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.devicesComboBox.FormattingEnabled = true;
             this.devicesComboBox.Location = new System.Drawing.Point(227, 39);
-            this.devicesComboBox.Margin = new System.Windows.Forms.Padding(2);
+            this.devicesComboBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.devicesComboBox.Name = "devicesComboBox";
-            this.devicesComboBox.Size = new System.Drawing.Size(206, 21);
+            this.devicesComboBox.Size = new System.Drawing.Size(206, 24);
             this.devicesComboBox.TabIndex = 1;
             this.devicesComboBox.Text = "Select your device";
             this.devicesComboBox.SelectedIndexChanged += new System.EventHandler(this.devicesComboBox_SelectedIndexChanged);
@@ -807,9 +809,9 @@
             this.remotesList.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.remotesList.FormattingEnabled = true;
             this.remotesList.Location = new System.Drawing.Point(530, 39);
-            this.remotesList.Margin = new System.Windows.Forms.Padding(2);
+            this.remotesList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.remotesList.Name = "remotesList";
-            this.remotesList.Size = new System.Drawing.Size(206, 21);
+            this.remotesList.Size = new System.Drawing.Size(206, 24);
             this.remotesList.TabIndex = 3;
             this.remotesList.Text = "Select a mirror";
             this.remotesList.SelectedIndexChanged += new System.EventHandler(this.remotesList_SelectedIndexChanged);
@@ -845,7 +847,7 @@
             this.searchTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.searchTextBox.Location = new System.Drawing.Point(741, 40);
             this.searchTextBox.Name = "searchTextBox";
-            this.searchTextBox.Size = new System.Drawing.Size(231, 20);
+            this.searchTextBox.Size = new System.Drawing.Size(231, 22);
             this.searchTextBox.TabIndex = 5;
             this.searchTextBox.Text = "Search";
             this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
@@ -862,7 +864,7 @@
             // 
             // gamesQueueLabel
             // 
-            this.gamesQueueLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.gamesQueueLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.gamesQueueLabel.AutoSize = true;
             this.gamesQueueLabel.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.gamesQueueLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -870,7 +872,7 @@
             this.gamesQueueLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.gamesQueueLabel.Location = new System.Drawing.Point(597, 628);
             this.gamesQueueLabel.Name = "gamesQueueLabel";
-            this.gamesQueueLabel.Size = new System.Drawing.Size(87, 15);
+            this.gamesQueueLabel.Size = new System.Drawing.Size(95, 16);
             this.gamesQueueLabel.TabIndex = 86;
             this.gamesQueueLabel.Text = "Games Queue";
             // 
@@ -893,6 +895,7 @@
             this.MountButton.Text = "Mount";
             this.MountButton.UseVisualStyleBackColor = false;
             this.MountButton.Click += new System.EventHandler(this.MountButton_Click);
+            this.MountButton.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
             // 
             // ProgressText
             // 
@@ -916,12 +919,12 @@
             this.notesRichTextBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.notesRichTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.notesRichTextBox.HideSelection = false;
-            this.notesRichTextBox.Location = new System.Drawing.Point(601, 652);
+            this.notesRichTextBox.Location = new System.Drawing.Point(601, 647);
             this.notesRichTextBox.Name = "notesRichTextBox";
             this.notesRichTextBox.ReadOnly = true;
             this.notesRichTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
             this.notesRichTextBox.ShowSelectionMargin = true;
-            this.notesRichTextBox.Size = new System.Drawing.Size(371, 91);
+            this.notesRichTextBox.Size = new System.Drawing.Size(371, 96);
             this.notesRichTextBox.TabIndex = 10;
             this.notesRichTextBox.Text = "";
             // 
@@ -942,7 +945,7 @@
             // 
             // label1
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label1.AutoSize = true;
             this.label1.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -950,7 +953,7 @@
             this.label1.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label1.Location = new System.Drawing.Point(598, 730);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 15);
+            this.label1.Size = new System.Drawing.Size(81, 16);
             this.label1.TabIndex = 86;
             this.label1.Text = "Install Notes";
             // 

MainForm.cs

@@ -41,6 +41,189 @@ namespace AndroidSideloader
 
         private string oldTitle = "";
 
+
+
+        private async void Form1_Load(object sender, EventArgs e)
+        {
+            string adbFile = "C:\\RSL\\2.1.1\\adb\\adb.exe";
+            string adbDir = "C:\\RSL\\2.1.1\\adb";
+            string fileName = "";
+            string destFile = "";
+            string date_time = DateTime.Today.ToString("dddd, MMMM dd @ hh:mmtt");
+            Logger.Log($"\n\n##############\n##############\n##############\n\nAPP LAUNCH DATE/TIME: " + date_time + "\n\n##############\n##############\n##############\n\n");
+            Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
+            Properties.Settings.Default.Save();
+
+            if (!File.Exists(adbFile))
+            {
+                Directory.CreateDirectory(adbDir);
+                if (System.IO.Directory.Exists($"{Environment.CurrentDirectory}\\adb"))
+                {
+                    string[] ADBfiles = System.IO.Directory.GetFiles($"{Properties.Settings.Default.MainDir}\\adb");
+
+                    // Copy the files and overwrite destination files if they already exist.
+                    foreach (string s in ADBfiles)
+                    {
+                        fileName = System.IO.Path.GetFileName(s);
+                        destFile = System.IO.Path.Combine(adbDir, fileName);
+                        System.IO.File.Copy(s, destFile, true);
+                    }
+                }
+
+            }
+            Properties.Settings.Default.ADBPath = adbFile;
+            Properties.Settings.Default.Save();
+            if (File.Exists(Sideloader.CrashLogPath))
+            {
+                DialogResult dialogResult = FlexibleMessageBox.Show(this, $"Sideloader crashed during your last use.\nPlease report issue @ https://github.com/nerdunit/androidsideloader/issues + send the crashlog to a mod or dev.\n\n(Crashlog.txt is located here: {Path.GetFullPath(Sideloader.CrashLogPath)})\n\nIf you've already sent it press YES to delete it and prevent this message. Press NO if you'd still like to send it.", "Crash Detected", MessageBoxButtons.YesNo);
+                if (dialogResult == DialogResult.Yes)
+                    File.Delete(Sideloader.CrashLogPath);
+            }
+            CheckForInternet();
+
+            if (HasInternet == true)
+                Sideloader.downloadFiles();
+            else
+                FlexibleMessageBox.Show("Cannot connect to google dns, your internet may be down, won't use rclone or online features!");
+            await Task.Delay(100);
+
+            if (!Directory.Exists(BackupFolder))
+                Directory.CreateDirectory(BackupFolder);
+
+            if (Directory.Exists(Sideloader.TempFolder))
+            {
+                Directory.Delete(Sideloader.TempFolder, true);
+                Directory.CreateDirectory(Sideloader.TempFolder);
+            }
+
+            //Delete the Debug file if it is more than 5MB
+            if (File.Exists(Logger.logfile))
+            {
+                long length = new System.IO.FileInfo(Logger.logfile).Length;
+                if (length > 5000000) File.Delete(Logger.logfile);
+            }
+
+            RCLONE.Init();
+            try { Spoofer.spoofer.Init(); } catch { }
+
+            if (Properties.Settings.Default.CallUpgrade)
+            {
+                Properties.Settings.Default.Upgrade();
+                Properties.Settings.Default.CallUpgrade = false;
+                Properties.Settings.Default.Save();
+            }
+
+            this.CenterToScreen();
+            gamesListView.View = View.Details;
+            gamesListView.FullRowSelect = true;
+            gamesListView.GridLines = true;
+            etaLabel.Text = "";
+            speedLabel.Text = "";
+            diskLabel.Text = "";
+
+            try
+            {
+                ADB.RunAdbCommandToString("kill-server");
+                ADB.WakeDevice();
+                await CheckForDevice();
+
+            }
+            catch { }
+        }
+
+
+        private async void Form1_Shown(object sender, EventArgs e)
+        {
+            new Thread(() =>
+            {
+                Thread.Sleep(10000);
+                freeDisclaimer.Invoke(() => { freeDisclaimer.Dispose(); });
+            }).Start();
+
+            Thread t1 = new Thread(() =>
+            {
+                if (!debugMode && Properties.Settings.Default.checkForUpdates)
+                {
+                    Updater.AppName = "AndroidSideloader";
+                    Updater.Repostory = "nerdunit/androidsideloader";
+                    Updater.Update();
+                }
+                progressBar.Invoke(() => { progressBar.Style = ProgressBarStyle.Marquee; });
+                ChangeTitle("Initializing Mirrors");
+                initMirrors(true);
+                ChangeTitle("Initializing Games");
+                SideloaderRCLONE.initGames(currentRemote);
+                if (!Directory.Exists(SideloaderRCLONE.ThumbnailsFolder) || !Directory.Exists(SideloaderRCLONE.NotesFolder))
+                {
+                    MessageBox.Show("It seems you are missing the thumbnails and/or notes database, the first start of the sideloader takes a bit more time, so dont worry if it looks stuck!");
+                }
+                ChangeTitle("Syncing Game Photos");
+                SideloaderRCLONE.UpdateGamePhotos(currentRemote);
+                ChangeTitle("Checking for Updates on server...");
+                SideloaderRCLONE.UpdateGameNotes(currentRemote);
+                listappsbtn();
+            });
+            t1.SetApartmentState(ApartmentState.STA);
+            t1.IsBackground = false;
+            if (HasInternet)
+                t1.Start();
+
+            showAvailableSpace();
+
+            intToolTips();
+
+            while (t1.IsAlive)
+                await Task.Delay(100);
+            ChangeTitle("GREEN = Up to date, ORANGE = Out of date - Checking installed app versions,  please wait...");
+
+            initListView();
+            ChangeTitle("Loaded");
+            downloadInstallGameButton.Enabled = true;
+
+            progressBar.Style = ProgressBarStyle.Continuous;
+            isLoading = false;
+        }
+
+
+
+        private void intToolTips()
+        {
+            ToolTip ListDevicesToolTip = new ToolTip();
+            ListDevicesToolTip.SetToolTip(this.devicesbutton, "Lists the devices in a message box, also updates title bar");
+            ToolTip SideloadAPKToolTip = new ToolTip();
+            SideloadAPKToolTip.SetToolTip(this.startsideloadbutton, "Sideloads/Installs one apk on the android device");
+            ToolTip OBBToolTip = new ToolTip();
+            OBBToolTip.SetToolTip(this.obbcopybutton, "Copies an obb folder to the Android/Obb folder from the device, some games/apps need this");
+            ToolTip BackupGameDataToolTip = new ToolTip();
+            BackupGameDataToolTip.SetToolTip(this.backupbutton, "Saves the game and apps data to the sideloader folder, does not save apk's and obb's");
+            ToolTip RestoreGameDataToolTip = new ToolTip();
+            RestoreGameDataToolTip.SetToolTip(this.restorebutton, "Restores the game and apps data to the device, first use Backup Game Data button");
+            ToolTip GetAPKToolTip = new ToolTip();
+            GetAPKToolTip.SetToolTip(this.getApkButton, "Saves the selected apk to the folder where the sideloader is");
+            ToolTip sideloadFolderToolTip = new ToolTip();
+            sideloadFolderToolTip.SetToolTip(this.sideloadFolderButton, "Sideloads every apk from a folder");
+            ToolTip uninstallAppToolTip = new ToolTip();
+            uninstallAppToolTip.SetToolTip(this.uninstallAppButton, "Uninstalls selected app");
+            ToolTip userjsonToolTip = new ToolTip();
+            userjsonToolTip.SetToolTip(this.ADBWirelessEnable, "After you enter your username it will create an user.json file needed for some games");
+            ToolTip etaToolTip = new ToolTip();
+            etaToolTip.SetToolTip(this.etaLabel, "Estimated time when game will finish download, updates every 5 seconds, format is HH:MM:SS");
+            ToolTip dlsToolTip = new ToolTip();
+            dlsToolTip.SetToolTip(this.speedLabel, "Current download speed, updates every second, in mbps");
+        }
+
+
+
+
+        void timer_Tick(object sender, EventArgs e)
+        {
+
+            ADB.RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
+        }
+
+
+
+
         public async void ChangeTitle(string txt, bool reset = true)
         {
             this.Invoke(() => { oldTitle = txt; this.Text = "Rookie's Sideloader | " + txt; });
@@ -105,13 +288,12 @@ namespace AndroidSideloader
             FlexibleMessageBox.Show(this, message);
         }
 
-        private List<string> Devices = new List<string>();
+        public List<string> Devices = new List<string>();
 
         public async Task<int> CheckForDevice()
         {
 
             Devices.Clear();
-            ADB.WakeDevice();
             string output = string.Empty;
             ADB.DeviceID = GetDeviceID();
             Thread t1 = new Thread(() =>
@@ -168,16 +350,13 @@ namespace AndroidSideloader
 
         private async void obbcopybutton_Click(object sender, EventArgs e)
         {
-            ADB.WakeDevice();
             ProcessOutput output = new ProcessOutput("", "");
             var dialog = new FolderSelectDialog
             {
                 Title = "Select your obb folder"
             };
             if (Properties.Settings.Default.IPAddress.Contains("connect"))
-            {
-                ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
-            }
+                ADB.WakeDevice();
             if (dialog.Show(Handle))
             {
                 Thread t1 = new Thread(() =>
@@ -198,8 +377,6 @@ namespace AndroidSideloader
 
         public void ChangeTitlebarToDevice()
         {
-
-            ADB.WakeDevice();
             if (!Devices.Contains("unauthorized"))
             {
                 if (Devices[0].Length > 1 && Devices[0].Contains("unauthorized"))
@@ -249,9 +426,6 @@ namespace AndroidSideloader
 
         public async void showAvailableSpace()
         {
-            ADB.WakeDevice();
-
-
             string AvailableSpace = string.Empty;
             ADB.DeviceID = GetDeviceID();
             Thread t1 = new Thread(() =>
@@ -268,7 +442,6 @@ namespace AndroidSideloader
 
         public string GetDeviceID()
         {
-            ADB.WakeDevice();
             string deviceId = string.Empty;
             int index = -1;
             devicesComboBox.Invoke(() => { index = devicesComboBox.SelectedIndex; });
@@ -299,14 +472,34 @@ namespace AndroidSideloader
 
         private async void Form1_Load(object sender, EventArgs e)
         {
-            ADB.WakeDevice();
-            if (!string.IsNullOrEmpty(Properties.Settings.Default.MainDir))
+            string adbFile = "C:\\RSL\\2.14HF5\\adb\\adb.exe";
+            string adbDir = "C:\\RSL\\2.14HF5\\adb";
+            string fileName = "";
+            string destFile = "";
+            Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
+            Properties.Settings.Default.Save();
+            if (!File.Exists(adbFile))
             {
-                Properties.Settings.Default.ADBPath = $"\"{Environment.CurrentDirectory}" + "\\adb\\adb.exe\"";
-                Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
-                Properties.Settings.Default.Save();
-            }
+                Directory.CreateDirectory(adbDir);
+                if (System.IO.Directory.Exists($"{Environment.CurrentDirectory}\\adb"))
+                {
+                    string[] ADBfiles = System.IO.Directory.GetFiles($"{Properties.Settings.Default.MainDir}\\adb");
 
+                    // Copy the files and overwrite destination files if they already exist.
+                    foreach (string s in ADBfiles)
+                    {
+                        fileName = System.IO.Path.GetFileName(s);
+                        destFile = System.IO.Path.Combine(adbDir, fileName);
+                        System.IO.File.Copy(s, destFile, true);
+                    }
+                }
+
+            }
+            Properties.Settings.Default.ADBPath = adbFile;
+            Properties.Settings.Default.Save();
+
+
+            ADB.RunAdbCommandToString("kill-server");
             if (File.Exists(Sideloader.CrashLogPath))
             {
                 DialogResult dialogResult = FlexibleMessageBox.Show(this, $@"Looks like sideloader crashed last time, please make an issue at https://github.com/nerdunit/androidsideloader/issues
@@ -433,14 +626,17 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
             ProcessOutput output = new ProcessOutput("", "");
             var dialog = new FolderSelectDialog
             {
-                Title = "Select your obb folder"
+                Title = "Select full backup or packagename backup folder"
             };
             if (dialog.Show(Handle))
             {
                 string path = dialog.FileName;
                 Thread t1 = new Thread(() =>
                 {
-                    output += ADB.RunAdbCommandToString($"push \"{path}\" /sdcard/Android/");
+                    if (path.Contains("data"))
+                      output += ADB.RunAdbCommandToString($"push \"{path}\" /sdcard/Android/");
+                    else 
+                      output += ADB.RunAdbCommandToString($"push \"{path}\" /sdcard/Android/data/");
                 });
                 t1.IsBackground = true;
                 t1.Start();
@@ -455,7 +651,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
         private string listapps()
         {
-            ADB.WakeDevice();
             ADB.DeviceID = GetDeviceID();
             return ADB.RunAdbCommandToString("shell pm list packages -3").Output;
         }
@@ -539,12 +734,10 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
             string GameName = m_combo.SelectedItem.ToString();
             string packagename = Sideloader.gameNameToPackageName(GameName);
-            MessageBox.Show($"If savedata is found it will be saved to Documents\\Rookie Backups\\{date_str}(year.month.date)\\{packagename}\\data", "Attempting Backup...", MessageBoxButtons.OK);
+            MessageBox.Show($"If savedata is found it will be saved to Documents\\Rookie Backups\\{date_str}(YYYY.MM.DD)\\{packagename}", "Attempting Backup...", MessageBoxButtons.OK);
 
             Directory.CreateDirectory(CurrBackups);
-            String CurrbackupPaths = CurrBackups + "\\" + packagename + "\\data";
-            Directory.CreateDirectory(CurrbackupPaths);
-            ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrbackupPaths}\"");
+            ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrBackups}\"");
             DialogResult dialogResult = MessageBox.Show($"Please check to see if we automatically found savedata in Documents\\Rookie Backups.\nIf there are no new files there is recommended that you do a full backup via Backup Gamedata before continuing.\nNOTE: Some games do not allow backup of savedata.\nContinue with the uninstall?", "Check for backup.", MessageBoxButtons.OKCancel);
             if (dialogResult == DialogResult.Cancel)
             {
@@ -635,6 +828,7 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
             ADB.DeviceID = GetDeviceID();
             progressBar.Style = ProgressBarStyle.Marquee;
             Thread t1 = new Thread(() =>
+
             {
                 string[] datas = (string[])e.Data.GetData(DataFormats.FileDrop);
                 foreach (string data in datas)
@@ -652,7 +846,7 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
                             if (File.Exists($"{Environment.CurrentDirectory}\\Install.txt"))
                             {
-                                
+
 
                                 DialogResult dialogResult = MessageBox.Show("Special instructions have been found with this file, would you like to run them automatically?", "Special Instructions found!", MessageBoxButtons.OKCancel);
                                 if (dialogResult == DialogResult.Cancel)
@@ -666,32 +860,34 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                                     output.Output = "";
                                 ChangeTitle("Done.");
                             }
-                    }
-                    string[] files = Directory.GetFiles(data);
-                    foreach (string file in files)
-                    {
+                        }
+                        string[] files = Directory.GetFiles(data);
+                        foreach (string file in files)
+                        {
                             if (File.Exists(file))
                                 if (file.EndsWith(".apk"))
                                 {
                                     output += ADB.Sideload(file);
                                 }
+                        }
+                        string[] folders = Directory.GetDirectories(data);
+                        foreach (string folder in folders)
+                        {
+                            output += ADB.CopyOBB(folder);
+                            Properties.Settings.Default.CurrPckg = dir;
+                            Properties.Settings.Default.Save();
+                        }
                     }
-                    string[] folders = Directory.GetDirectories(data);
-                    foreach (string folder in folders)
-                    {
-                        output += ADB.CopyOBB(folder);
-                    }
-                }
                     //if it's a file
                     else if (File.Exists(data))
                     {
-                       
+
                         string extension = Path.GetExtension(data);
                         if (extension == ".apk")
                         {
                             if (File.Exists($"{dir}\\Install.txt"))
                             {
-                    
+
                                 DialogResult dialogResult = MessageBox.Show("Special instructions have been found with this file, would you like to run them automatically?", "Special Instructions found!", MessageBoxButtons.OKCancel);
                                 if (dialogResult == DialogResult.Cancel)
                                     return;
@@ -717,6 +913,8 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                             Directory.CreateDirectory(foldername);
                             File.Copy(data, foldername + "\\" + filename);
                             output += ADB.CopyOBB(foldername);
+                            Properties.Settings.Default.CurrPckg = foldername;
+                            Properties.Settings.Default.Save();
                             Directory.Delete(foldername, true);
                         }
 
@@ -758,7 +956,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
         }
         private void initListView()
         {
-            ADB.WakeDevice();
             gamesListView.Items.Clear();
             gamesListView.Columns.Clear();
             if (!File.Exists("installedPackages.json"))
@@ -887,8 +1084,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
         private void initMirrors(bool random)
         {
-            ADB.WakeDevice();
-
             int index = 0;
             remotesList.Invoke(() => { index = remotesList.SelectedIndex; remotesList.Items.Clear(); });
 
@@ -1241,7 +1436,6 @@ without him none of this would be possible
                 }
                 if (quotaError == false)
                 {
-                    ADB.WakeDevice();
                     ADB.DeviceID = GetDeviceID();
                     quotaTries = 0;
                     progressBar.Value = 0;
@@ -1261,13 +1455,6 @@ without him none of this would be possible
                         string extension = Path.GetExtension(file);
                         if (extension == ".apk")
                         {
-                            if (File.Exists($"{gameDirectory}\\Install.txt"))
-                            {
-
-                                ChangeTitle("Sideloading custom install.txt automatically.");
-                                output += Sideloader.RunADBCommandsFromFile(path);
-                                ChangeTitle("Done.");
-                            }
                             Thread apkThread = new Thread(() =>
                             {
                                 string packagename = "";
@@ -1288,7 +1475,6 @@ without him none of this would be possible
                     }
 
                     Debug.WriteLine(wrDelimiter);
-                    ADB.WakeDevice();
                     string[] folders = Directory.GetDirectories(Environment.CurrentDirectory + "\\" + gameName);
 
                     foreach (string folder in folders)
@@ -1307,6 +1493,7 @@ without him none of this would be possible
 
                             while (obbThread.IsAlive)
                                 await Task.Delay(100);
+                            ChangeTitle("Done");
                         }
                     }
 
@@ -1339,6 +1526,7 @@ without him none of this would be possible
         private void Form1_FormClosing(object sender, FormClosingEventArgs e)
         {
             RCLONE.killRclone();
+            ADB.RunAdbCommandToString("kill-server");
         }
 
         private void ADBWirelessDisable_Click(object sender, EventArgs e)
@@ -1496,7 +1684,7 @@ without him none of this would be possible
                 FlexibleMessageBox.Show("There are no games in rclone, please check your internet connection and check if the config is working properly");
                 return;
             }
-            string gamesToUpdate = "";
+
             foreach (string packagename in Sideloader.InstalledPackages.Keys)
             {
                 foreach (var release in SideloaderRCLONE.games)
@@ -1538,10 +1726,10 @@ without him none of this would be possible
 
             if (DeviceConnected)
             {
-                if (!ADB.DeviceID.Contains(":5555"))
+                if (ADB.DeviceID.Contains(":5555"))
                     MessageBox.Show("Mounting does not work with Wireless ADB, you must plug Quest into PC to mount.");
                 
-                    ADB.RunAdbCommandToString("shell svc usb setFunctions mtp true");
+                ADB.RunAdbCommandToString("shell svc usb setFunctions mtp true");
             }
             else
                 FlexibleMessageBox.Show("You must connect a device before mounting!");

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.Today.ToString("dddd, MMMM dd @ hh:mmtt");
+            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/Settings.Designer.cs

@@ -85,7 +85,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
         public bool userJsonOnGameInstall {
             get {
                 return ((bool)(this["userJsonOnGameInstall"]));
@@ -181,7 +181,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Microsoft Sans Serif, 8.5pt")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Microsoft Sans Serif, 9.5pt")]
         public global::System.Drawing.Font FontStyle {
             get {
                 return ((global::System.Drawing.Font)(this["FontStyle"]));
@@ -313,7 +313,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
         public string QUhz {
             get {
                 return ((string)(this["QUhz"]));
@@ -325,7 +325,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
         public string QUres {
             get {
                 return ((string)(this["QUres"]));
@@ -337,7 +337,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
         public string QUy {
             get {
                 return ((string)(this["QUy"]));
@@ -349,7 +349,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
         public string QUx {
             get {
                 return ((string)(this["QUx"]));
@@ -361,7 +361,7 @@ namespace AndroidSideloader.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Change Me")]
         public string QUname {
             get {
                 return ((string)(this["QUname"]));
@@ -418,5 +418,17 @@ namespace AndroidSideloader.Properties {
                 this["delsh"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string CurrPckg {
+            get {
+                return ((string)(this["CurrPckg"]));
+            }
+            set {
+                this["CurrPckg"] = value;
+            }
+        }
     }
 }

Properties/Settings.settings

@@ -18,7 +18,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="userJsonOnGameInstall" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="CallUpgrade" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
@@ -42,7 +42,7 @@
       <Value Profile="(Default)">White</Value>
     </Setting>
     <Setting Name="FontStyle" Type="System.Drawing.Font" Scope="User">
-      <Value Profile="(Default)">Microsoft Sans Serif, 8.5pt</Value>
+      <Value Profile="(Default)">Microsoft Sans Serif, 9.5pt</Value>
     </Setting>
     <Setting Name="BackPicturePath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -75,19 +75,19 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="QUhz" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="QUres" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="QUy" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="QUx" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="QUname" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">Change Me</Value>
     </Setting>
     <Setting Name="QUString" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -101,5 +101,8 @@
     <Setting Name="delsh" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="CurrPckg" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>

QuestForm.Designer.cs

@@ -125,7 +125,7 @@ namespace AndroidSideloader
             // 
             this.ResetQU.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.ResetQU.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.ResetQU.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.5F);
+            this.ResetQU.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
             this.ResetQU.ForeColor = System.Drawing.SystemColors.ControlLight;
             this.ResetQU.Location = new System.Drawing.Point(191, 555);
             this.ResetQU.Name = "ResetQU";
@@ -134,13 +134,13 @@ namespace AndroidSideloader
             this.ResetQU.Text = "RESET ALL FIELDS";
             this.ResetQU.UseVisualStyleBackColor = false;
             this.ResetQU.Visible = false;
-            this.ResetQU.Click += new System.EventHandler(this.Clear_click);
+            this.ResetQU.Click += new System.EventHandler(this.ResetQU_click);
             // 
             // deleteButton
             // 
             this.deleteButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.deleteButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.deleteButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.5F);
+            this.deleteButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
             this.deleteButton.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
             this.deleteButton.Location = new System.Drawing.Point(13, 606);
             this.deleteButton.Name = "deleteButton";
@@ -155,7 +155,7 @@ namespace AndroidSideloader
             // 
             this.questPics.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.questPics.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.questPics.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.5F);
+            this.questPics.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
             this.questPics.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
             this.questPics.Location = new System.Drawing.Point(17, 265);
             this.questPics.Name = "questPics";
@@ -169,7 +169,7 @@ namespace AndroidSideloader
             // 
             this.questVids.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.questVids.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.questVids.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.5F);
+            this.questVids.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
             this.questVids.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
             this.questVids.Location = new System.Drawing.Point(191, 265);
             this.questVids.Name = "questVids";
@@ -213,7 +213,7 @@ namespace AndroidSideloader
             // 
             this.button3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.5F);
+            this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
             this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
             this.button3.Location = new System.Drawing.Point(101, 702);
             this.button3.Name = "button3";
@@ -332,7 +332,7 @@ namespace AndroidSideloader
             "4"});
             this.CPUComboBox.Location = new System.Drawing.Point(13, 126);
             this.CPUComboBox.Name = "CPUComboBox";
-            this.CPUComboBox.Size = new System.Drawing.Size(345, 21);
+            this.CPUComboBox.Size = new System.Drawing.Size(345, 24);
             this.CPUComboBox.TabIndex = 2;
             this.CPUComboBox.Text = "Select CPU level (0 for default)";
             // 
@@ -354,7 +354,7 @@ namespace AndroidSideloader
             "4"});
             this.GPUComboBox.Location = new System.Drawing.Point(13, 97);
             this.GPUComboBox.Name = "GPUComboBox";
-            this.GPUComboBox.Size = new System.Drawing.Size(345, 21);
+            this.GPUComboBox.Size = new System.Drawing.Size(345, 24);
             this.GPUComboBox.TabIndex = 1;
             this.GPUComboBox.Text = "Select GPU level (0 for default)";
             // 
@@ -368,7 +368,7 @@ namespace AndroidSideloader
             this.label7.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label7.Location = new System.Drawing.Point(13, 532);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(44, 15);
+            this.label7.Size = new System.Drawing.Size(49, 16);
             this.label7.TabIndex = 3;
             this.label7.Text = "Fov - X";
             this.label7.Visible = false;
@@ -384,7 +384,7 @@ namespace AndroidSideloader
             this.label8.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label8.Location = new System.Drawing.Point(191, 532);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(43, 15);
+            this.label8.Size = new System.Drawing.Size(50, 16);
             this.label8.TabIndex = 3;
             this.label8.Text = "Fov - Y";
             this.label8.Visible = false;
@@ -400,7 +400,7 @@ namespace AndroidSideloader
             this.label9.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label9.Location = new System.Drawing.Point(11, 583);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(79, 15);
+            this.label9.Size = new System.Drawing.Size(87, 16);
             this.label9.TabIndex = 3;
             this.label9.Text = "Refresh Rate";
             this.label9.Visible = false;
@@ -415,7 +415,7 @@ namespace AndroidSideloader
             this.label6.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label6.Location = new System.Drawing.Point(13, 484);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(142, 15);
+            this.label6.Size = new System.Drawing.Size(153, 16);
             this.label6.TabIndex = 3;
             this.label6.Text = "Enter Custom Username";
             this.label6.Visible = false;
@@ -431,7 +431,7 @@ namespace AndroidSideloader
             this.label5.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label5.Location = new System.Drawing.Point(12, 434);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(278, 15);
+            this.label5.Size = new System.Drawing.Size(301, 16);
             this.label5.TabIndex = 3;
             this.label5.Text = "Custom Resolution Width (Height auto calculated)";
             this.label5.Visible = false;
@@ -447,7 +447,7 @@ namespace AndroidSideloader
             this.ResolutionLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.ResolutionLabel.Location = new System.Drawing.Point(11, 183);
             this.ResolutionLabel.Name = "ResolutionLabel";
-            this.ResolutionLabel.Size = new System.Drawing.Size(163, 15);
+            this.ResolutionLabel.Size = new System.Drawing.Size(177, 16);
             this.ResolutionLabel.TabIndex = 3;
             this.ResolutionLabel.Text = "Resolution (p eye, 0=default)";
             // 
@@ -461,7 +461,7 @@ namespace AndroidSideloader
             this.FOVy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.FOVy.Location = new System.Drawing.Point(191, 507);
             this.FOVy.Name = "FOVy";
-            this.FOVy.Size = new System.Drawing.Size(167, 20);
+            this.FOVy.Size = new System.Drawing.Size(167, 22);
             this.FOVy.TabIndex = 12;
             this.FOVy.Text = "0";
             this.FOVy.Visible = false;
@@ -477,7 +477,7 @@ namespace AndroidSideloader
             this.FOVx.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.FOVx.Location = new System.Drawing.Point(13, 507);
             this.FOVx.Name = "FOVx";
-            this.FOVx.Size = new System.Drawing.Size(169, 20);
+            this.FOVx.Size = new System.Drawing.Size(169, 22);
             this.FOVx.TabIndex = 11;
             this.FOVx.Text = "0";
             this.FOVx.Visible = false;
@@ -493,7 +493,7 @@ namespace AndroidSideloader
             this.UsrBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.UsrBox.Location = new System.Drawing.Point(13, 459);
             this.UsrBox.Name = "UsrBox";
-            this.UsrBox.Size = new System.Drawing.Size(345, 20);
+            this.UsrBox.Size = new System.Drawing.Size(345, 22);
             this.UsrBox.TabIndex = 10;
             this.UsrBox.Text = "0";
             this.UsrBox.Visible = false;
@@ -509,7 +509,7 @@ namespace AndroidSideloader
             this.ResBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.ResBox.Location = new System.Drawing.Point(13, 409);
             this.ResBox.Name = "ResBox";
-            this.ResBox.Size = new System.Drawing.Size(345, 20);
+            this.ResBox.Size = new System.Drawing.Size(345, 22);
             this.ResBox.TabIndex = 9;
             this.ResBox.Text = "0";
             this.ResBox.Visible = false;
@@ -525,7 +525,7 @@ namespace AndroidSideloader
             this.TextureResTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.TextureResTextBox.Location = new System.Drawing.Point(13, 155);
             this.TextureResTextBox.Name = "TextureResTextBox";
-            this.TextureResTextBox.Size = new System.Drawing.Size(169, 20);
+            this.TextureResTextBox.Size = new System.Drawing.Size(169, 22);
             this.TextureResTextBox.TabIndex = 3;
             this.TextureResTextBox.Text = "0";
             // 
@@ -581,7 +581,7 @@ namespace AndroidSideloader
             "120"});
             this.QURfrRt.Location = new System.Drawing.Point(12, 555);
             this.QURfrRt.Name = "QURfrRt";
-            this.QURfrRt.Size = new System.Drawing.Size(170, 21);
+            this.QURfrRt.Size = new System.Drawing.Size(170, 24);
             this.QURfrRt.TabIndex = 13;
             this.QURfrRt.Text = "0";
             this.QURfrRt.Visible = false;
@@ -603,7 +603,7 @@ namespace AndroidSideloader
             "120"});
             this.RefreshRateComboBox.Location = new System.Drawing.Point(13, 68);
             this.RefreshRateComboBox.Name = "RefreshRateComboBox";
-            this.RefreshRateComboBox.Size = new System.Drawing.Size(345, 21);
+            this.RefreshRateComboBox.Size = new System.Drawing.Size(345, 24);
             this.RefreshRateComboBox.TabIndex = 0;
             this.RefreshRateComboBox.Text = "Select refresh rate";
             // 
@@ -649,8 +649,8 @@ namespace AndroidSideloader
             this.Controls.Add(this.button1);
             this.Controls.Add(this.QURfrRt);
             this.Controls.Add(this.RefreshRateComboBox);
-            this.MaximumSize = new System.Drawing.Size(386, 808);
-            this.MinimumSize = new System.Drawing.Size(386, 608);
+            this.MaximumSize = new System.Drawing.Size(386, 776);
+            this.MinimumSize = new System.Drawing.Size(386, 776);
             this.Name = "QuestForm";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

QuestForm.cs

@@ -68,10 +68,10 @@ namespace AndroidSideloader
 
 
 
-        private void Clear_click(object sender, EventArgs e)
+        public void ResetQU_click(object sender, EventArgs e)
         {
             ResBox.Text = ("0");
-            UsrBox.Clear();
+            UsrBox.Text = ("Change Me");
             FOVx.Text = ("0");
             FOVy.Text = ("0");
             QURfrRt.SelectedIndex = 0;
@@ -124,6 +124,7 @@ namespace AndroidSideloader
                 label9.Visible = false;
                 label10.Visible = false;
                 deleteButton.Visible = false;
+                
                 MessageBox.Show("Ok, Deleted your custom settings file.\nIf you would like to re-enable return here and apply settings again");
                 File.Delete($"{Properties.Settings.Default.MainDir}\\Config.Json");
             }

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

@@ -58,27 +58,29 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
             var commands = File.ReadAllLines(path);
             foreach (string cmd in commands)
             {
-                if (cmd.StartsWith("\"7z.exe\""))
+                if (cmd.Contains("7z.exe"))
                 {
                     Program.form.ChangeTitle($"Running {cmd}");
                     Logger.Log($"Logging command: {cmd} from file: {path}");
-                    output += ADB.RunAdbCommandToStringWOADB(cmd, path);
+                    output += ADB.RunCommandToString(cmd, path);
                 }
                 if (cmd.StartsWith("adb"))
                 {
+                    string replacement = "";
                     string pattern = "adb";
-                    string replacement = $"{Properties.Settings.Default.ADBPath} -s {ADB.DeviceID}";
+                    if (ADB.DeviceID.Length > 1)
+                    replacement = $"{Properties.Settings.Default.ADBPath} -s {ADB.DeviceID}";
+                    else
+                    replacement = $"{Properties.Settings.Default.ADBPath}";
                     Regex rgx = new Regex(pattern);
                     string result = rgx.Replace(cmd, replacement);
                     Program.form.ChangeTitle($"Running {result}");
                     Logger.Log($"Logging command: {result} from file: {path}");
-                    if (ADB.DeviceID.Length > 1)
-                        output += ADB.RunAdbCommandToStringWOADB(result, path);
+                    output += ADB.RunAdbCommandToStringWOADB(result, path);
                     if (output.Error.Contains("mkdir"))
                         output.Error = "";
                     if (output.Output.Contains("reserved"))
                         output.Output = "";
-                    
                 }
             }
             output.Output += "Custom install successful!";

Sideloader/RCLONE.cs

@@ -115,7 +115,7 @@ namespace AndroidSideloader
             catch { return 0; }
         }
 
-        public static async Task updateConfig(string remote)
+        public static void updateConfig(string remote)
         {
             string localHash = "";
             try { localHash = File.ReadAllText(Environment.CurrentDirectory + "\\rclone\\hash.txt"); } catch { } //file may not exist

Updater.cs

@@ -17,7 +17,7 @@ namespace AndroidSideloader
         private static string RawGitHubUrl;
         private static string GitHubUrl;
 
-        static readonly public string LocalVersion = "2.1";
+        static readonly public string LocalVersion = "2.1HF5";
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 
@@ -28,8 +28,6 @@ namespace AndroidSideloader
             try
             {
                 currentVersion = client.GetStringAsync($"{RawGitHubUrl}/master/version").Result;
-                if (currentVersion.Length > LocalVersion.Length)
-                    currentVersion = currentVersion.Remove(currentVersion.Length - 1);
                 changelog = client.GetStringAsync($"{RawGitHubUrl}/master/changelog.txt").Result;
                 client.Dispose();
             }
@@ -40,8 +38,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
 {
@@ -8,11 +9,19 @@ namespace AndroidSideloader
 
         public static bool Log(string text, bool ret = true)
         {
-            string newline = "\n";
-            if (text.Length > 40 && text.Contains("\n"))
-                newline += "\n\n";
-            try { File.AppendAllText(logfile, text + newline); } catch { }
-            return ret;
+            if (text.Length > 0)
+            {
+                string time = DateTime.UtcNow.ToString("hh:mmtt(UTC): ");
+                string newline = "\n";
+                if (text.Length > 40 && text.Contains("\n"))
+                    newline += "\n\n";
+                text = time += text;
+                try { File.AppendAllText(logfile, text + newline); } catch { }
+                return ret;
+            }
+            else
+                return ret;
+            
         }
     }
 }

changelog.txt

@@ -1,6 +1,141 @@
 -----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.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmC2YLYACgkQx/Rql1Vo
+czfzXxAAlgKvec94/48QX27BYxVLExEO1AukM7c3D4ONDq4xz6R7jZdoGTbSpfPg
+IVbJX8ZeMVQS5yPQr3YOEYdfunU5olu2+XMx5be0uuq0VpZsHdh4Z99GDZId+YFX
+W9AJ86p0l9Z6m6npJnc64Fz+3akq8bbZVNHjIpTl99ZSpNMuwYtGpKzNjDXZ9h/Q
+v4xQKlCJy7pZO9XY6wEf1z0s+2dMCAGTnfVP6nSXwhx+jKHudRcIRNy7vfgke7d6
+tVGRQxe0UP1fth9D80R6y+PGw318kNxqPH5b9bN5+PJrHwaHdQ7vXwrVdgVU4g12
+53bGcRdNH1+N0mEXCz0VQyYmd73HVYtNYYEtocUY+I/W/sxBqbPcvVJ+XZinFfdg
+BaX5I2M5Ub56wUtyzpP3OoFkIMAN6/Z9S1k/Mq2qTPH/aGtprFzWgmg32kWHi9/n
+64uIf4TQlr4o6t0MrMR1pk/F38Rnow66sn5v4eOQ01c9bFOANTMxL2fQiZluSK98
+36eYYdxPkSwPiRDVZTrwOOPbJfiHeKREHFcBT2C7OehJm5PkueSzW+CVnjSfH92q
+yjp1+zGEaYn5pos+TeaN22uG0L3U5wbfUuCHSHWstIMEwx0aroKhRyou1MtZn40W
+k5PjmtDRjt36eLH3MzSxnhwydFrC2V2rl6UbtxjYjdlqEEdFlX4=
+=224y
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 !!!IMPORTANT!!!
 THIS VERSION IS A WORK IN PROGRESS DUE TO LACK OF TESTERS!!!
 

version

@@ -1 +1 @@
-2.0-WIP-SU1
+2.1.1HF1