Merge pull request #62 from VRPirates/beta/RSL-2.26

beta/rsl 2.26

ADB.cs

@@ -9,7 +9,7 @@ namespace AndroidSideloader
     internal class ADB
     {
         private static readonly Process adb = new Process();
-        public static string adbFolderPath = "C:\\RSL\\platform-tools";
+        public static string adbFolderPath = $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools";
         public static string adbFilePath = adbFolderPath + "\\adb.exe";
         public static string DeviceID = "";
         public static string package = "";
@@ -33,62 +33,54 @@ namespace AndroidSideloader
 
                 _ = Logger.Log($"Running command: {logcmd}");
             }
-            adb.StartInfo.FileName = adbFilePath;
-            adb.StartInfo.Arguments = command;
-            adb.StartInfo.RedirectStandardError = true;
-            adb.StartInfo.RedirectStandardOutput = true;
-            adb.StartInfo.CreateNoWindow = true;
-            adb.StartInfo.UseShellExecute = false;
-            adb.StartInfo.WorkingDirectory = adbFolderPath;
-            _ = adb.Start();
 
-            string output = "";
-            string error = "";
-
-            try
+            using (Process adb = new Process())
             {
-                output = adb.StandardOutput.ReadToEnd();
-                error = adb.StandardError.ReadToEnd();
-            }
-            catch { }
+                adb.StartInfo.FileName = adbFilePath;
+                adb.StartInfo.Arguments = command;
+                adb.StartInfo.RedirectStandardError = true;
+                adb.StartInfo.RedirectStandardOutput = true;
+                adb.StartInfo.CreateNoWindow = true;
+                adb.StartInfo.UseShellExecute = false;
+                adb.StartInfo.WorkingDirectory = adbFolderPath;
+                _ = adb.Start();
 
-            if (command.Contains("connect"))
-            {
-                bool graceful = adb.WaitForExit(3000);  // Wait 3 secs.
-                if (!graceful)
+                string output = "";
+                string error = "";
+
+                try
                 {
-                    adb.Kill();
+                    output = adb.StandardOutput.ReadToEnd();
+                    error = adb.StandardError.ReadToEnd();
                 }
-            }
-            else
-            {
-                adb.WaitForExit();
-            }
+                catch { }
 
-            if (error.Contains("ADB_VENDOR_KEYS") && !Properties.Settings.Default.adbdebugwarned)
-            {
-                DialogResult dialogResult = FlexibleMessageBox.Show(Program.form, "Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.\nPlease note that even if you have done this\nbefore it will reset itself from time to time.\n\nPress CANCEL if you want to disable this prompt (FOR DEBUGGING ONLY, NOT RECOMMENDED).", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
-                if (dialogResult == DialogResult.Cancel)
+                if (command.Contains("connect"))
                 {
-                    Properties.Settings.Default.adbdebugwarned = true;
-                    Properties.Settings.Default.Save();
+                    bool graceful = adb.WaitForExit(3000);
+                    if (!graceful)
+                    {
+                        adb.Kill();
+                        adb.WaitForExit();
+                    }
                 }
-                else
-                {
-                    ADB.WakeDevice();
-                }
-            }
-            if (error.Contains("not enough storage space"))
-            {
-                _ = FlexibleMessageBox.Show(Program.form, "There is not enough room on your device to install this package. Please clear AT LEAST 2x the amount of the app you are trying to install.");
-            }
-            if (!output.Contains("version") && !output.Contains("KEYCODE_WAKEUP") && !output.Contains("Filesystem") && !output.Contains("package:") && !output.Equals(null))
-            {
-                _ = Logger.Log(output);
-            }
 
-            _ = Logger.Log(error, "ERROR");
-            return new ProcessOutput(output, error);
+                if (error.Contains("ADB_VENDOR_KEYS") && !Properties.Settings.Default.adbdebugwarned)
+                {
+                    ADBDebugWarning();
+                }
+                if (error.Contains("not enough storage space"))
+                {
+                    _ = FlexibleMessageBox.Show(Program.form, "There is not enough room on your device to install this package. Please clear AT LEAST 2x the amount of the app you are trying to install.");
+                }
+                if (!output.Contains("version") && !output.Contains("KEYCODE_WAKEUP") && !output.Contains("Filesystem") && !output.Contains("package:") && !output.Equals(null))
+                {
+                    _ = Logger.Log(output);
+                }
+
+                _ = Logger.Log(error, LogLevel.ERROR);
+                return new ProcessOutput(output, error);
+            }
         }
 
         public static ProcessOutput RunAdbCommandToStringWOADB(string result, string path)
@@ -130,40 +122,24 @@ namespace AndroidSideloader
                 if (!graceful)
                 {
                     adb.Kill();
-                }
-                else
-                {
-                    adb.WaitForExit();
+                    adb.WaitForExit(); 
                 }
             }
-            else if (command.Contains("install"))
+            else if (command.Contains("connect"))
             {
-                bool graceful = adb.WaitForExit(120000);
+                bool graceful = adb.WaitForExit(3000); 
                 if (!graceful)
                 {
-                    adb.Kill();
-                }
-                else
-                {
+                    adb.Kill(); 
                     adb.WaitForExit();
                 }
             }
-
             if (error.Contains("ADB_VENDOR_KEYS") && Properties.Settings.Default.adbdebugwarned)
             {
-                DialogResult dialogResult = FlexibleMessageBox.Show(Program.form, "Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.\nPlease note that even if you have done this\nbefore it will reset itself from time to time.\n\nPress CANCEL if you want to disable this prompt (FOR DEBUGGING ONLY, NOT RECOMMENDED).", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
-                if (dialogResult == DialogResult.Cancel)
-                {
-                    Properties.Settings.Default.adbdebugwarned = true;
-                    Properties.Settings.Default.Save();
-                }
-                else
-                {
-                    ADB.WakeDevice();
-                }
+                ADBDebugWarning();
             }
             _ = Logger.Log(output);
-            _ = Logger.Log(error, "ERROR");
+            _ = Logger.Log(error, LogLevel.ERROR);
             return new ProcessOutput(output, error);
         }
         public static ProcessOutput RunCommandToString(string result, string path = "")
@@ -176,7 +152,7 @@ namespace AndroidSideloader
             }
 
             _ = Logger.Log($"Running command: {logcmd}");
-            adb.StartInfo.FileName = @"C:\Windows\System32\cmd.exe";
+            adb.StartInfo.FileName = $@"{Path.GetPathRoot(Environment.SystemDirectory)}\Windows\System32\cmd.exe";
             adb.StartInfo.Arguments = command;
             adb.StartInfo.RedirectStandardError = true;
             adb.StartInfo.RedirectStandardInput = true;
@@ -205,14 +181,22 @@ namespace AndroidSideloader
                 if (!graceful)
                 {
                     adb.Kill();
+                    adb.WaitForExit();
                 }
             }
-            else
-            {
-                adb.WaitForExit();
-            }
 
             if (error.Contains("ADB_VENDOR_KEYS") && Properties.Settings.Default.adbdebugwarned)
+            {
+                ADBDebugWarning();
+            }
+            _ = Logger.Log(output);
+            _ = Logger.Log(error, LogLevel.ERROR);
+            return new ProcessOutput(output, error);
+        }
+
+        public static void ADBDebugWarning()
+        {
+            Program.form.Invoke(() =>
             {
                 DialogResult dialogResult = FlexibleMessageBox.Show(Program.form, "Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.\nPlease note that even if you have done this\nbefore it will reset itself from time to time.\n\nPress CANCEL if you want to disable this prompt (FOR DEBUGGING ONLY, NOT RECOMMENDED).", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
                 if (dialogResult == DialogResult.Cancel)
@@ -220,20 +204,11 @@ namespace AndroidSideloader
                     Properties.Settings.Default.adbdebugwarned = true;
                     Properties.Settings.Default.Save();
                 }
-                else
-                {
-                    ADB.WakeDevice();
-                }
-            }
-            _ = Logger.Log(output);
-            _ = Logger.Log(error, "ERROR");
-            return new ProcessOutput(output, error);
+            });
         }
 
-
         public static ProcessOutput UninstallPackage(string package)
         {
-            WakeDevice();
             ProcessOutput output = new ProcessOutput("", "");
             output += RunAdbCommandToString($"shell pm uninstall {package}");
             return output;
@@ -242,41 +217,22 @@ namespace AndroidSideloader
         public static string GetAvailableSpace()
         {
             long totalSize = 0;
-
             long usedSize = 0;
-
             long freeSize = 0;
-            WakeDevice();
+
             string[] output = RunAdbCommandToString("shell df").Output.Split('\n');
 
             foreach (string currLine in output)
             {
                 if (currLine.StartsWith("/dev/fuse") || currLine.StartsWith("/data/media"))
                 {
-                    string[] foo = currLine.Split(' ');
-                    int i = 0;
-                    foreach (string curr in foo)
+                    string[] foo = currLine.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                    if (foo.Length >= 4)
                     {
-                        if (curr.Length > 1)
-                        {
-                            switch (i)
-                            {
-                                case 0:
-                                    break;
-                                case 1:
-                                    totalSize = long.Parse(curr) / 1000;
-                                    break;
-                                case 2:
-                                    usedSize = long.Parse(curr) / 1000;
-                                    break;
-                                case 3:
-                                    freeSize = long.Parse(curr) / 1000;
-                                    break;
-                                default:
-                                    break;
-                            }
-                            i++;
-                        }
+                        totalSize = long.Parse(foo[1]) / 1000;
+                        usedSize = long.Parse(foo[2]) / 1000;
+                        freeSize = long.Parse(foo[3]) / 1000;
+                        break; // Assuming we only need the first matching line
                     }
                 }
             }
@@ -285,21 +241,9 @@ namespace AndroidSideloader
         }
 
         public static bool wirelessadbON;
-
-        public static void WakeDevice()
-        {
-            _ = RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
-            if (!string.IsNullOrEmpty(Properties.Settings.Default.IPAddress) && !Properties.Settings.Default.Wired)
-            {
-                _ = RunAdbCommandToString(Properties.Settings.Default.IPAddress);
-            }
-        }
-
-
         public static ProcessOutput Sideload(string path, string packagename = "")
         {
 
-            WakeDevice();
             ProcessOutput ret = new ProcessOutput();
             ret += RunAdbCommandToString($"install -g \"{path}\"");
             string out2 = ret.Output + ret.Error;
@@ -310,16 +254,11 @@ namespace AndroidSideloader
                 if (out2.Contains("offline") && !Properties.Settings.Default.nodevicemode)
                 {
                     DialogResult dialogResult2 = FlexibleMessageBox.Show(Program.form, "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();
-                    }
                 }
                 if (out2.Contains($"signatures do not match previously") || out2.Contains("INSTALL_FAILED_VERSION_DOWNGRADE") || out2.Contains("signatures do not match") || out2.Contains("failed to install"))
                 {
                     ret.Error = string.Empty;
                     ret.Output = string.Empty;
-                    ADB.WakeDevice();
                     if (!Properties.Settings.Default.AutoReinstall)
                     {
                         bool cancelClicked = false;
@@ -338,13 +277,13 @@ namespace AndroidSideloader
                             return ret;
                     }
 
-                    Program.form.ChangeTitle("Performing reinstall, please wait...");
+                    Program.form.changeTitle("Performing reinstall, please wait...");
                     _ = ADB.RunAdbCommandToString("kill-server");
                     _ = ADB.RunAdbCommandToString("devices");
                     _ = ADB.RunAdbCommandToString($"pull /sdcard/Android/data/{MainForm.CurrPCKG} \"{Environment.CurrentDirectory}\"");
-                    Program.form.ChangeTitle("Uninstalling game...");
+                    Program.form.changeTitle("Uninstalling game...");
                     _ = Sideloader.UninstallGame(MainForm.CurrPCKG);
-                    Program.form.ChangeTitle("Reinstalling Game");
+                    Program.form.changeTitle("Reinstalling Game");
                     ret += ADB.RunAdbCommandToString($"install -g \"{path}\"");
                     _ = ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\{MainForm.CurrPCKG}\" /sdcard/Android/data/");
                     if (Directory.Exists($"{Environment.CurrentDirectory}\\{MainForm.CurrPCKG}"))
@@ -352,64 +291,22 @@ namespace AndroidSideloader
                         Directory.Delete($"{Environment.CurrentDirectory}\\{MainForm.CurrPCKG}", true);
                     }
 
-                    Program.form.ChangeTitle(" \n\n");
+                    Program.form.changeTitle(" \n\n");
                     return ret;
                 }
             }
-            string gamenameforQU = Sideloader.PackageNametoGameName(packagename);
-            if (Properties.Settings.Default.QUturnedon)
-            {
-                if (gamenameforQU.Contains("-QU") || path.Contains("-QU"))
-                {
-                    string gameName = packagename;
-                    packagename = Sideloader.gameNameToPackageName(gameName);
 
-                    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);
-                    int y = r.Next(9999999);
-
-                    long sum = (y * (long)1000000000) + x;
-
-                    int x2 = r.Next(999999999);
-                    int y2 = r.Next(9999999);
-
-                    long sum2 = (y2 * (long)1000000000) + 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($"{Properties.Settings.Default.MainDir}\\config.json", boff);
-                    string blank = "";
-                    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("");
+            Program.form.changeTitle(string.Empty);
             return ret;
         }
 
         public static ProcessOutput CopyOBB(string path)
         {
-            WakeDevice();
-
             string folder = Path.GetFileName(path);
-            return !folder.Contains("+") && !folder.Contains("_") && folder.Contains(".")
-                ? RunAdbCommandToString($"push \"{path}\" \"/sdcard/Android/obb\"")
-                : new ProcessOutput();
+            string lastFolder = Path.GetFileName(path);
+            return folder.Contains(".")
+                ? RunAdbCommandToString($"shell rm -rf /sdcard/Android/obb/{lastFolder} && mkdir /sdcard/Android/obb/{lastFolder}") + RunAdbCommandToString($"push \"{path}\" \"/sdcard/Android/obb\"")
+                : new ProcessOutput("No OBB Folder found");
         }
     }
 }

AndroidSideloader.csproj

@@ -232,13 +232,6 @@
       <DependentUpon>SettingsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Sideloader.cs" />
-    <Compile Include="spoofer.cs" />
-    <Compile Include="SpoofForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SpoofForm.Designer.cs">
-      <DependentUpon>SpoofForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Updater.cs" />
     <Compile Include="UsernameForm.cs">
       <SubType>Form</SubType>
@@ -288,9 +281,6 @@
       <DependentUpon>SettingsForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="SpoofForm.resx">
-      <DependentUpon>SpoofForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="UsernameForm.resx">
       <DependentUpon>UsernameForm.cs</DependentUpon>
       <SubType>Designer</SubType>

App.config

@@ -56,36 +56,9 @@
             <setting name="ADBPath" serializeAs="String">
                 <value />
             </setting>
-            <setting name="QUsett" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="QuChecked" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="QUhz" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="QUres" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="QUy" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="QUx" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="QUname" serializeAs="String">
-                <value>Change Me</value>
-            </setting>
-            <setting name="QUString" serializeAs="String">
-                <value />
-            </setting>
             <setting name="MainDir" serializeAs="String">
                 <value />
             </setting>
-            <setting name="QUStringF" serializeAs="String">
-                <value />
-            </setting>
             <setting name="delsh" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -104,9 +77,6 @@
             <setting name="PackageNameToCB" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="EnterKeyInstall" serializeAs="String">
-                <value>False</value>
-            </setting>
             <setting name="DownUpHeld" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -122,9 +92,6 @@
             <setting name="CurrentCrashName" serializeAs="String">
                 <value />
             </setting>
-            <setting name="QUturnedon" serializeAs="String">
-                <value>False</value>
-            </setting>
             <setting name="adbdebugwarned" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -206,6 +173,9 @@
             <setting name="singleThreadMode" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="virtualFilesystemCompatibility" serializeAs="String">
+                <value>False</value>
+            </setting>
         </AndroidSideloader.Properties.Settings>
         <AndroidADB.Sideloader.Properties.Settings>
             <setting name="checkForUpdates" serializeAs="String">

ChangelogHistory.txt

@@ -1,4 +1,85 @@
-RSL 2.19
+RSL 2.25.1
+
+- Fix: Device not authorized prompt showing up after authorization.
+
+RSL 2.25
+
+- Fix: Fix to unauthorized device bug
+- Chore: Update Wiki URL
+
+
+RSL 2.24
+
+- Feature: Added "Open Download" and "Open Backup" Directory buttons to Settings Menu
+- Fix: OBB Pushes for Quest 3 Devices
+- Fix: Crash when attempting to backup
+- Fix: Searchbar Anchoring when resizing
+- Fix: Remove instances where OBBs are pushed multiple times
+- Fix: Additional Logging and Startup Optimizations
+
+RSL 2.23
+
+- Fix: Rookie should now only prompt for newer versions of all games
+- Fix: Crash when attempting to delete invalid directories or files
+- Feature: Enable Maximize Button
+
+RSL 2.22
+
+- Fix: Crash on failed extractions.
+- Fix: Trailers controls not functioning properly.
+- Fix: No Device Mode having the wrong output message.
+- Chore: Remove ADB.WakeDevice() due to being non-functional.
+- Chore: Make changeTitlebarToDevice less prone to crashes and more robust.
+
+RSL 2.21
+
+- Feature: Search now shows all results found
+- Feature: Add --no-rclone-updating launch flag
+- Feature: Add lime-green color to various after download jobs
+- Feature: Update Sideloader Launcher to check for Rookie
+- Feature: Add the ability to download into virtual filesystems (Settings)
+- Feature: Add stacktrace & innerexception to crashlog
+- Feature: Add CallerInfo to debuglog
+- Feature: Rookie will now tell the user when there's a running RCLONE Job
+- Fix: Rookie will no longer repeat "All tasks finished." in No Device Mode
+- Fix: Rookie should no longer delete the entire OBB/Data folder when uninstalling a game
+- Fix: Rookie should no longer freeze on the OBB Comparison
+- Fix: The free disclaimer on launch is no longer broken
+- Fix: Use new process for every ADB command
+- Fix: Do not delete game files on an OBB Mismatch anymore
+- Fix: Change all hardcoded C:/ paths to dynamically grab the system drive for further compatability
+- Fix: Rookie should now function on 32 Bit again
+- Fix: Fix crash on failed extraction
+- Chore: Update quota message to be up to date
+- Chore: Code rewrites for logging system, obb comparison, updater
+- Chore: Several redundant code removals
+- Chore: Change Install w/ Enter Key to Download w/ Enter Key
+- Chore: Several code cleanups & optimizations
+~ Chax
+
+RSL 2.20
+
+- Feature: Added manual IP on Wireless ADB
+- Feature: Rookie will now delete old OBB Folders before pushing new obb folders
+- Feature: Add Single-Thread mode in settings (For users with download issues using multiple threads)
+- Fix: Device Storage display
+- Fix: Games that come with install.txt will now check for a device to avoid freezes
+- Fix: "No Device Mode" checkbox can't have "Delete after Download and Install" enabled at the same time anymore
+- Fix: Removing Queue Items should no longer ever crash Rookie
+- Fix: Rookie will no longer reload the gamelist if you have filtered it
+- Fix: Check if the rclone we are killing is ours
+- Fix: Put zip extraction into a thread to avoid freezing the UI
+- Fix: Filters should no longer cause crashes.
+- Chore: Update RCLONE to 1.62.2
+- Chore: Cleaning up the code for the Trailers, progress bar, dropdown categories, redundant internet checks, and other code cleanup
+- Chore: Other UI and message box display cleanup
+- Chore: Optimize the code for getting the thumbnail paths
+- Chore: Log Levels added to Debuglog
+
+- Thank you to Chax for the new features and fixes!
+~ fenopy
+
+RSL 2.19
 
 - Feature: Added streaming Game Trailers (enable in Settings)
 - Feature: Added custom Download Directories

Donors.cs

@@ -22,38 +22,33 @@ namespace AndroidSideloader
         {
             donorGameProperties.Clear();
             donorGames.Clear();
-            if (!MainForm.DonorApps.Equals(""))
+            if (!string.IsNullOrEmpty(MainForm.donorApps))
             {
-                string[] gameListSplited = MainForm.DonorApps.Split(new[] { '\n' });
+                string[] gameListSplited = MainForm.donorApps.Split('\n');
                 foreach (string game in gameListSplited)
                 {
                     if (game.Length > 1)
                     {
-                        string[] splitGame = game.Split(';');
-                        donorGames.Add(splitGame);
+                        donorGames.Add(game.Split(';'));
                     }
                 }
             }
-
-
         }
+
         public static void initNewApps()
         {
             newApps.Clear();
-            if (!DonorsListViewForm.newAppsForList.Equals(""))
+            if (!string.IsNullOrEmpty(DonorsListViewForm.newAppsForList))
             {
-                string[] newListSplited = DonorsListViewForm.newAppsForList.Split(new[] { '\n' });
+                string[] newListSplited = DonorsListViewForm.newAppsForList.Split('\n');
                 foreach (string game in newListSplited)
                 {
                     if (game.Length > 1)
                     {
-                        string[] splitGame = game.Split(';');
-                        newApps.Add(splitGame);
+                        newApps.Add(game.Split(';'));
                     }
                 }
             }
-
-
         }
     }
 }

DonorsListView.Designer.cs

@@ -30,20 +30,21 @@ namespace AndroidSideloader
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DonorsListViewForm));
             this.DonorsListView = new System.Windows.Forms.ListView();
             this.GameNameIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.PackageNameIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.VersionCodeIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.UpdateOrNew = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.panel1 = new System.Windows.Forms.Panel();
-            this.SkipButton = new System.Windows.Forms.Button();
+            this.SkipButton = new AndroidSideloader.RoundButton();
+            this.DonateButton = new AndroidSideloader.RoundButton();
             this.panel2 = new System.Windows.Forms.Panel();
             this.bothdet = new System.Windows.Forms.Label();
             this.newdet = new System.Windows.Forms.Label();
             this.upddet = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.TimerDesc = new System.Windows.Forms.Label();
-            this.DonateButton = new System.Windows.Forms.Button();
             this.DonationTimer = new System.Windows.Forms.Timer(this.components);
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -112,13 +113,13 @@ namespace AndroidSideloader
             this.panel1.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
             this.panel1.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes_1_1_1_0_0_0_1__000000_212121;
             this.panel1.Controls.Add(this.SkipButton);
+            this.panel1.Controls.Add(this.DonateButton);
             this.panel1.Controls.Add(this.panel2);
             this.panel1.Controls.Add(this.bothdet);
             this.panel1.Controls.Add(this.newdet);
             this.panel1.Controls.Add(this.upddet);
             this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.TimerDesc);
-            this.panel1.Controls.Add(this.DonateButton);
             this.panel1.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.panel1.Location = new System.Drawing.Point(-7, -7);
             this.panel1.Name = "panel1";
@@ -130,21 +131,56 @@ namespace AndroidSideloader
             // 
             // SkipButton
             // 
-            this.SkipButton.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
+            this.SkipButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.SkipButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.SkipButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.SkipButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
             this.SkipButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.SkipButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.SkipButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.SkipButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.SkipButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.SkipButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.SkipButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
             this.SkipButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
+            this.SkipButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.SkipButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
             this.SkipButton.Location = new System.Drawing.Point(22, 277);
+            this.SkipButton.Margin = new System.Windows.Forms.Padding(0);
             this.SkipButton.Name = "SkipButton";
+            this.SkipButton.Radius = 5;
             this.SkipButton.Size = new System.Drawing.Size(102, 36);
-            this.SkipButton.TabIndex = 1;
+            this.SkipButton.Stroke = true;
+            this.SkipButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
+            this.SkipButton.TabIndex = 96;
             this.SkipButton.Text = "Skip";
-            this.SkipButton.UseVisualStyleBackColor = true;
+            this.SkipButton.Transparency = false;
             this.SkipButton.Click += new System.EventHandler(this.SkipButton_Click);
             // 
+            // DonateButton
+            // 
+            this.DonateButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.DonateButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.DonateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.DonateButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.DonateButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.DonateButton.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.DonateButton.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.DonateButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.DonateButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
+            this.DonateButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
+            this.DonateButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.DonateButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+            this.DonateButton.Location = new System.Drawing.Point(130, 277);
+            this.DonateButton.Margin = new System.Windows.Forms.Padding(0);
+            this.DonateButton.Name = "DonateButton";
+            this.DonateButton.Radius = 5;
+            this.DonateButton.Size = new System.Drawing.Size(311, 36);
+            this.DonateButton.Stroke = true;
+            this.DonateButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
+            this.DonateButton.TabIndex = 95;
+            this.DonateButton.Text = "Automatically share selected apps";
+            this.DonateButton.Transparency = false;
+            this.DonateButton.Click += new System.EventHandler(this.DonateButton_Click);
+            // 
             // panel2
             // 
             this.panel2.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
@@ -233,22 +269,6 @@ namespace AndroidSideloader
             this.TimerDesc.MouseMove += new System.Windows.Forms.MouseEventHandler(this.DonorsListViewForm_MouseMove);
             this.TimerDesc.MouseUp += new System.Windows.Forms.MouseEventHandler(this.DonorsListViewForm_MouseUp);
             // 
-            // DonateButton
-            // 
-            this.DonateButton.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
-            this.DonateButton.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.DonateButton.Enabled = false;
-            this.DonateButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.DonateButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.DonateButton.ForeColor = System.Drawing.Color.White;
-            this.DonateButton.Location = new System.Drawing.Point(130, 277);
-            this.DonateButton.Name = "DonateButton";
-            this.DonateButton.Size = new System.Drawing.Size(311, 36);
-            this.DonateButton.TabIndex = 1;
-            this.DonateButton.Text = "Automatically share selected apps";
-            this.DonateButton.UseVisualStyleBackColor = true;
-            this.DonateButton.Click += new System.EventHandler(this.DonateButton_Click);
-            // 
             // DonorsListViewForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -259,6 +279,7 @@ namespace AndroidSideloader
             this.Controls.Add(this.panel1);
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "DonorsListViewForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Load += new System.EventHandler(this.DonorsListViewForm_Load);
@@ -276,18 +297,18 @@ namespace AndroidSideloader
 
         private System.Windows.Forms.ListView DonorsListView;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Button DonateButton;
         private System.Windows.Forms.Label TimerDesc;
         private System.Windows.Forms.ColumnHeader GameNameIndex;
         private System.Windows.Forms.ColumnHeader PackageNameIndex;
         private System.Windows.Forms.ColumnHeader VersionCodeIndex;
         private System.Windows.Forms.ColumnHeader UpdateOrNew;
         public System.Windows.Forms.Timer DonationTimer;
-        private System.Windows.Forms.Button SkipButton;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label bothdet;
         private System.Windows.Forms.Label newdet;
         private System.Windows.Forms.Label upddet;
         private System.Windows.Forms.Panel panel2;
+        private RoundButton DonateButton;
+        private RoundButton SkipButton;
     }
 }

DonorsListView.cs

@@ -28,14 +28,14 @@ namespace AndroidSideloader
             DonorsListView.EndUpdate();
         }
 
-        public static string DonorsLocal = MainForm.DonorApps;
+        public static string DonorsLocal = MainForm.donorApps;
         public static bool ifuploads = false;
         public static string newAppsForList = "";
 
 
         private void DonorsListViewForm_Load(object sender, EventArgs e)
         {
-            MainForm.updatesnotified = true;
+            MainForm.updatesNotified = true;
             if (MainForm.updates && MainForm.newapps)
             {
                 bothdet.Visible = true;
@@ -106,26 +106,17 @@ namespace AndroidSideloader
 
             if (ifuploads)
             {
-                MainForm.DoUpload();
+                MainForm.doUpload();
             }
             Close();
         }
 
         private void DonorsListView_ItemChecked(object sender, ItemCheckedEventArgs e)
         {
-            if (DonorsListView.CheckedItems.Count == 0)
-            {
-                SkipButton.Enabled = true;
-                DonateButton.Enabled = false;
-            }
-            else
-            {
-                DonateButton.Enabled = true;
-                SkipButton.Enabled = false;
-            }
+            SkipButton.Enabled = DonorsListView.CheckedItems.Count == 0;
+            DonateButton.Enabled = !SkipButton.Enabled;
         }
 
-
         private void SkipButton_Click(object sender, EventArgs e)
         {
             bool uncheckednewapps = false;

MainForm.resx

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="speedLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>219, 17</value>
+  </metadata>
+  <metadata name="etaLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>178, 56</value>
+  </metadata>
   <metadata name="startsideloadbutton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -150,12 +156,6 @@
   <metadata name="settingsButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>319, 56</value>
   </metadata>
-  <metadata name="InstallQUset_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <metadata name="removeQUSetting_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1365, 17</value>
-  </metadata>
   <metadata name="QuestOptionsButton_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1158, 17</value>
   </metadata>
@@ -177,7 +177,4 @@
   <metadata name="etaLabel_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>178, 56</value>
   </metadata>
-  <metadata name="EnterInstallBox_Tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>514, 95</value>
-  </metadata>
 </root>

NewApps.Designer.cs

@@ -29,6 +29,7 @@ namespace AndroidSideloader
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewApps));
             this.NewAppsListView = new System.Windows.Forms.ListView();
             this.GameNameIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.PackageNameIndex = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -133,6 +134,7 @@ namespace AndroidSideloader
             this.Controls.Add(this.panel2);
             this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "NewApps";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Load += new System.EventHandler(this.NewApps_Load);

NewApps.cs

@@ -53,7 +53,7 @@ namespace AndroidSideloader
                     Properties.Settings.Default.Save();
                 }
             }
-            MainForm.newpackageupload();
+            MainForm.newPackageUpload();
             Close();
         }
 

Program.cs

@@ -16,7 +16,7 @@ namespace AndroidSideloader
         {
 
             AppDomain currentDomain = AppDomain.CurrentDomain;
-            currentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
+            currentDomain.UnhandledException += new UnhandledExceptionEventHandler(CrashHandler);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
@@ -26,11 +26,16 @@ namespace AndroidSideloader
         }
         public static MainForm form;
 
-        private static void MyHandler(object sender, UnhandledExceptionEventArgs args)
+        private static void CrashHandler(object sender, UnhandledExceptionEventArgs args)
         {
+            // Capture unhandled exceptions and write to file. 
             Exception e = (Exception)args.ExceptionObject;
+            string innerExceptionMessage = (e.InnerException != null) 
+                ? e.InnerException.Message
+                : "None";
             string date_time = DateTime.Now.ToString("dddd, MMMM dd @ hh:mmtt (UTC)");
-            File.WriteAllText(Sideloader.CrashLogPath, $"Date/Time of crash: {date_time}\nMessage: {e.Message}\nData: {e.Data}\nSource: {e.Source}\nTargetSite: {e.TargetSite}\n\n\nDebuglog: \n\n\n");
+            File.WriteAllText(Sideloader.CrashLogPath, $"Date/Time of crash: {date_time}\nMessage: {e.Message}\nInner Message: {innerExceptionMessage}\nData: {e.Data}\nSource: {e.Source}\nTargetSite: {e.TargetSite}\nStack Trace: \n{e.StackTrace}\n\n\nDebuglog: \n\n\n");
+            // If a debuglog exists we append it to the crashlog.
             if (File.Exists(Properties.Settings.Default.CurrentLogPath))
             {
                 File.AppendAllText(Sideloader.CrashLogPath, File.ReadAllText($"{Properties.Settings.Default.CurrentLogPath}"));

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", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -203,101 +203,7 @@ namespace AndroidSideloader.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool QUsett {
-            get {
-                return ((bool)(this["QUsett"]));
-            }
-            set {
-                this["QUsett"] = value;
-            }
-        }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string QuChecked {
-            get {
-                return ((string)(this["QuChecked"]));
-            }
-            set {
-                this["QuChecked"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string QUhz {
-            get {
-                return ((string)(this["QUhz"]));
-            }
-            set {
-                this["QUhz"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string QUres {
-            get {
-                return ((string)(this["QUres"]));
-            }
-            set {
-                this["QUres"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string QUy {
-            get {
-                return ((string)(this["QUy"]));
-            }
-            set {
-                this["QUy"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("0")]
-        public string QUx {
-            get {
-                return ((string)(this["QUx"]));
-            }
-            set {
-                this["QUx"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Change Me")]
-        public string QUname {
-            get {
-                return ((string)(this["QUname"]));
-            }
-            set {
-                this["QUname"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string QUString {
-            get {
-                return ((string)(this["QUString"]));
-            }
-            set {
-                this["QUString"] = value;
-            }
-        }
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -310,18 +216,7 @@ namespace AndroidSideloader.Properties {
                 this["MainDir"] = value;
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string QUStringF {
-            get {
-                return ((string)(this["QUStringF"]));
-            }
-            set {
-                this["QUStringF"] = value;
-            }
-        }
+
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -395,18 +290,6 @@ namespace AndroidSideloader.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool EnterKeyInstall {
-            get {
-                return ((bool)(this["EnterKeyInstall"]));
-            }
-            set {
-                this["EnterKeyInstall"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -466,19 +349,7 @@ namespace AndroidSideloader.Properties {
                 this["CurrentCrashName"] = value;
             }
         }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool QUturnedon {
-            get {
-                return ((bool)(this["QUturnedon"]));
-            }
-            set {
-                this["QUturnedon"] = value;
-            }
-        }
-        
+
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -801,5 +672,17 @@ namespace AndroidSideloader.Properties {
                 this["singleThreadMode"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool virtualFilesystemCompatibility {
+            get {
+                return ((bool)(this["virtualFilesystemCompatibility"]));
+            }
+            set {
+                this["virtualFilesystemCompatibility"] = value;
+            }
+        }
     }
 }

Properties/Settings.settings

@@ -47,36 +47,9 @@
     <Setting Name="ADBPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="QUsett" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="QuChecked" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="QUhz" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="QUres" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="QUy" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="QUx" Type="System.String" Scope="User">
-      <Value Profile="(Default)">0</Value>
-    </Setting>
-    <Setting Name="QUname" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Change Me</Value>
-    </Setting>
-    <Setting Name="QUString" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="MainDir" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="QUStringF" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="delsh" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -95,9 +68,6 @@
     <Setting Name="PackageNameToCB" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="EnterKeyInstall" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="DownUpHeld" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -113,9 +83,6 @@
     <Setting Name="CurrentCrashName" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="QUturnedon" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="adbdebugwarned" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -197,5 +164,8 @@
     <Setting Name="singleThreadMode" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="virtualFilesystemCompatibility" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

QuestForm.Designer.cs

@@ -32,44 +32,27 @@ namespace AndroidSideloader
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuestForm));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
-            this.QUon = new System.Windows.Forms.CheckBox();
             this.label12 = new System.Windows.Forms.Label();
-            this.label13 = new System.Windows.Forms.Label();
             this.DeleteShots = new System.Windows.Forms.CheckBox();
             this.splitter1 = new System.Windows.Forms.Splitter();
             this.label10 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
             this.label16 = new System.Windows.Forms.Label();
             this.CPUComboBox = new System.Windows.Forms.ComboBox();
             this.GPUComboBox = new System.Windows.Forms.ComboBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label8 = new System.Windows.Forms.Label();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
             this.ResolutionLabel = new System.Windows.Forms.Label();
             this.GlobalUsername = new System.Windows.Forms.TextBox();
-            this.FOVy = new System.Windows.Forms.TextBox();
-            this.FOVx = new System.Windows.Forms.TextBox();
-            this.UsrBox = new System.Windows.Forms.TextBox();
-            this.ResBox = new System.Windows.Forms.TextBox();
             this.TextureResTextBox = new System.Windows.Forms.TextBox();
-            this.QURfrRt = new System.Windows.Forms.ComboBox();
             this.RefreshRateComboBox = new System.Windows.Forms.ComboBox();
             this.button1 = new AndroidSideloader.RoundButton();
-            this.WifiWake = new AndroidSideloader.RoundButton();
             this.questVids = new AndroidSideloader.RoundButton();
             this.questPics = new AndroidSideloader.RoundButton();
-            this.QUEnable = new AndroidSideloader.RoundButton();
-            this.deleteButton = new AndroidSideloader.RoundButton();
-            this.ResetQU = new AndroidSideloader.RoundButton();
             this.button3 = new AndroidSideloader.RoundButton();
+            this.label3 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // label1
@@ -78,11 +61,11 @@ namespace AndroidSideloader
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label1.ForeColor = System.Drawing.Color.LightCyan;
-            this.label1.Location = new System.Drawing.Point(31, 5);
+            this.label1.Location = new System.Drawing.Point(72, 276);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(309, 20);
+            this.label1.Size = new System.Drawing.Size(165, 20);
             this.label1.TabIndex = 6;
-            this.label1.Text = "Temporary settings for all Quest apps";
+            this.label1.Text = "Temporary Settings";
             this.label1.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
             // label2
@@ -92,41 +75,13 @@ namespace AndroidSideloader
             this.label2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label2.ForeColor = System.Drawing.Color.LightSteelBlue;
-            this.label2.Location = new System.Drawing.Point(70, 28);
+            this.label2.Location = new System.Drawing.Point(83, 303);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(230, 32);
+            this.label2.Size = new System.Drawing.Size(143, 16);
             this.label2.TabIndex = 6;
-            this.label2.Text = "Reboot to reset. - Turn screen off, \r\nthen back on with hold button to apply.";
+            this.label2.Text = "Reboot Quest to Reset";
             this.label2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.BackColor = System.Drawing.Color.Transparent;
-            this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.ForeColor = System.Drawing.Color.LightCyan;
-            this.label3.Location = new System.Drawing.Point(57, 339);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(256, 20);
-            this.label3.TabIndex = 6;
-            this.label3.Text = "QU Settings (for -QU releases)";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.BackColor = System.Drawing.Color.Transparent;
-            this.label4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label4.ForeColor = System.Drawing.Color.LightSteelBlue;
-            this.label4.Location = new System.Drawing.Point(16, 363);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(337, 16);
-            this.label4.TabIndex = 6;
-            this.label4.Text = "Persists on device reboot. Enter 0 to reset any category.\r\n";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // label11
             // 
             this.label11.AutoSize = true;
@@ -134,31 +89,13 @@ namespace AndroidSideloader
             this.label11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label11.ForeColor = System.Drawing.Color.LightCyan;
-            this.label11.Location = new System.Drawing.Point(26, 217);
+            this.label11.Location = new System.Drawing.Point(18, 94);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(319, 20);
+            this.label11.Size = new System.Drawing.Size(272, 20);
             this.label11.TabIndex = 6;
-            this.label11.Text = "Transfer screen/videoshots to Desktop";
+            this.label11.Text = "Transfer screenshots to Desktop";
             this.label11.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
-            // QUon
-            // 
-            this.QUon.AutoSize = true;
-            this.QUon.BackColor = System.Drawing.Color.Transparent;
-            this.QUon.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.QUon.Cursor = System.Windows.Forms.Cursors.Default;
-            this.QUon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.QUon.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
-            this.QUon.ForeColor = System.Drawing.Color.LightSkyBlue;
-            this.QUon.Location = new System.Drawing.Point(111, 383);
-            this.QUon.Name = "QUon";
-            this.QUon.Size = new System.Drawing.Size(148, 21);
-            this.QUon.TabIndex = 8;
-            this.QUon.Text = "Enable QU Settings";
-            this.QUon.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.QUon.UseVisualStyleBackColor = false;
-            this.QUon.CheckedChanged += new System.EventHandler(this.QUon_CheckedChanged);
-            // 
             // label12
             // 
             this.label12.AutoSize = true;
@@ -166,27 +103,13 @@ namespace AndroidSideloader
             this.label12.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label12.ForeColor = System.Drawing.Color.LightCyan;
-            this.label12.Location = new System.Drawing.Point(121, 656);
+            this.label12.Location = new System.Drawing.Point(92, 9);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(128, 20);
+            this.label12.Size = new System.Drawing.Size(124, 20);
             this.label12.TabIndex = 6;
-            this.label12.Text = "Set username*";
+            this.label12.Text = "Set Username";
             this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label13
-            // 
-            this.label13.AutoSize = true;
-            this.label13.BackColor = System.Drawing.Color.Transparent;
-            this.label13.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label13.ForeColor = System.Drawing.Color.LightSteelBlue;
-            this.label13.Location = new System.Drawing.Point(83, 678);
-            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(203, 16);
-            this.label13.TabIndex = 6;
-            this.label13.Text = "*For games not released by -QU.";
-            this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // DeleteShots
             // 
             this.DeleteShots.AutoSize = true;
@@ -196,7 +119,7 @@ namespace AndroidSideloader
             this.DeleteShots.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.DeleteShots.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
             this.DeleteShots.ForeColor = System.Drawing.Color.LightSkyBlue;
-            this.DeleteShots.Location = new System.Drawing.Point(64, 296);
+            this.DeleteShots.Location = new System.Drawing.Point(33, 232);
             this.DeleteShots.Name = "DeleteShots";
             this.DeleteShots.Size = new System.Drawing.Size(242, 21);
             this.DeleteShots.TabIndex = 7;
@@ -209,7 +132,7 @@ namespace AndroidSideloader
             // 
             this.splitter1.Location = new System.Drawing.Point(0, 0);
             this.splitter1.Name = "splitter1";
-            this.splitter1.Size = new System.Drawing.Size(3, 737);
+            this.splitter1.Size = new System.Drawing.Size(3, 486);
             this.splitter1.TabIndex = 14;
             this.splitter1.TabStop = false;
             // 
@@ -217,7 +140,7 @@ namespace AndroidSideloader
             // 
             this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
             this.label10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label10.Location = new System.Drawing.Point(-4, 327);
+            this.label10.Location = new System.Drawing.Point(-4, 261);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(394, 3);
             this.label10.TabIndex = 15;
@@ -226,20 +149,11 @@ namespace AndroidSideloader
             // 
             this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
             this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label14.Location = new System.Drawing.Point(-15, 211);
+            this.label14.Location = new System.Drawing.Point(-4, 80);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(394, 3);
             this.label14.TabIndex = 17;
             // 
-            // label15
-            // 
-            this.label15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
-            this.label15.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label15.Location = new System.Drawing.Point(-12, 646);
-            this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(394, 3);
-            this.label15.TabIndex = 18;
-            // 
             // label16
             // 
             this.label16.AutoSize = true;
@@ -247,11 +161,11 @@ namespace AndroidSideloader
             this.label16.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label16.ForeColor = System.Drawing.Color.LightSteelBlue;
-            this.label16.Location = new System.Drawing.Point(14, 241);
+            this.label16.Location = new System.Drawing.Point(34, 153);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(342, 16);
+            this.label16.Size = new System.Drawing.Size(240, 16);
             this.label16.TabIndex = 6;
-            this.label16.Text = "Desktop\\Quest Screenshots  Desktop\\Quest Videoshots";
+            this.label16.Text = "Exports to: Desktop\\Quest Screenshots";
             this.label16.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
             // CPUComboBox
@@ -269,12 +183,11 @@ namespace AndroidSideloader
             "2",
             "3",
             "4"});
-            this.CPUComboBox.Location = new System.Drawing.Point(13, 123);
+            this.CPUComboBox.Location = new System.Drawing.Point(38, 383);
             this.CPUComboBox.Name = "CPUComboBox";
-            this.CPUComboBox.Size = new System.Drawing.Size(346, 26);
+            this.CPUComboBox.Size = new System.Drawing.Size(232, 26);
             this.CPUComboBox.TabIndex = 2;
             this.CPUComboBox.Text = "Select CPU level (0 for default)";
-            this.CPUComboBox.SelectedIndexChanged += new System.EventHandler(this.CPUComboBox_SelectedIndexChanged);
             // 
             // GPUComboBox
             // 
@@ -291,92 +204,11 @@ namespace AndroidSideloader
             "2",
             "3",
             "4"});
-            this.GPUComboBox.Location = new System.Drawing.Point(13, 94);
+            this.GPUComboBox.Location = new System.Drawing.Point(38, 354);
             this.GPUComboBox.Name = "GPUComboBox";
-            this.GPUComboBox.Size = new System.Drawing.Size(346, 26);
+            this.GPUComboBox.Size = new System.Drawing.Size(232, 26);
             this.GPUComboBox.TabIndex = 1;
             this.GPUComboBox.Text = "Select GPU level (0 for default)";
-            this.GPUComboBox.SelectedIndexChanged += new System.EventHandler(this.GPUComboBox_SelectedIndexChanged);
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.BackColor = System.Drawing.Color.Transparent;
-            this.label7.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label7.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label7.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label7.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            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(56, 18);
-            this.label7.TabIndex = 3;
-            this.label7.Text = "Fov - X";
-            this.label7.Visible = false;
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.BackColor = System.Drawing.Color.Transparent;
-            this.label8.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label8.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label8.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            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(55, 18);
-            this.label8.TabIndex = 3;
-            this.label8.Text = "Fov - Y";
-            this.label8.Visible = false;
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.BackColor = System.Drawing.Color.Transparent;
-            this.label9.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label9.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label9.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.label9.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label9.Location = new System.Drawing.Point(12, 583);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(95, 18);
-            this.label9.TabIndex = 3;
-            this.label9.Text = "Refresh Rate";
-            this.label9.Visible = false;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.BackColor = System.Drawing.Color.Transparent;
-            this.label6.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label6.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label6.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.label6.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label6.Location = new System.Drawing.Point(93, 484);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(173, 18);
-            this.label6.TabIndex = 3;
-            this.label6.Text = "Enter Custom Username";
-            this.label6.Visible = false;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.BackColor = System.Drawing.Color.Transparent;
-            this.label5.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label5.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.label5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.label5.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.label5.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label5.Location = new System.Drawing.Point(16, 434);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(337, 18);
-            this.label5.TabIndex = 3;
-            this.label5.Text = "Custom Resolution Width (Height auto calculated)";
-            this.label5.Visible = false;
             // 
             // ResolutionLabel
             // 
@@ -387,7 +219,7 @@ namespace AndroidSideloader
             this.ResolutionLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.ResolutionLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.ResolutionLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.ResolutionLabel.Location = new System.Drawing.Point(12, 183);
+            this.ResolutionLabel.Location = new System.Drawing.Point(38, 413);
             this.ResolutionLabel.Name = "ResolutionLabel";
             this.ResolutionLabel.Size = new System.Drawing.Size(153, 18);
             this.ResolutionLabel.TabIndex = 3;
@@ -401,76 +233,12 @@ namespace AndroidSideloader
             this.GlobalUsername.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.GlobalUsername.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.GlobalUsername.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.GlobalUsername.Location = new System.Drawing.Point(12, 701);
+            this.GlobalUsername.Location = new System.Drawing.Point(33, 39);
             this.GlobalUsername.Name = "GlobalUsername";
-            this.GlobalUsername.Size = new System.Drawing.Size(262, 24);
+            this.GlobalUsername.Size = new System.Drawing.Size(142, 24);
             this.GlobalUsername.TabIndex = 12;
             this.GlobalUsername.TextChanged += new System.EventHandler(this.GlobalUsername_TextChanged);
             // 
-            // FOVy
-            // 
-            this.FOVy.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
-            this.FOVy.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.FOVy.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.FOVy.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.FOVy.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.FOVy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.FOVy.Location = new System.Drawing.Point(189, 507);
-            this.FOVy.Name = "FOVy";
-            this.FOVy.Size = new System.Drawing.Size(169, 24);
-            this.FOVy.TabIndex = 12;
-            this.FOVy.Text = "0";
-            this.FOVy.Visible = false;
-            this.FOVy.TextChanged += new System.EventHandler(this.FOVy_TextChanged);
-            // 
-            // FOVx
-            // 
-            this.FOVx.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
-            this.FOVx.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.FOVx.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.FOVx.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.FOVx.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            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, 24);
-            this.FOVx.TabIndex = 11;
-            this.FOVx.Text = "0";
-            this.FOVx.Visible = false;
-            this.FOVx.TextChanged += new System.EventHandler(this.FOVx_TextChanged);
-            // 
-            // UsrBox
-            // 
-            this.UsrBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
-            this.UsrBox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.UsrBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.UsrBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.UsrBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            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, 24);
-            this.UsrBox.TabIndex = 10;
-            this.UsrBox.Text = "0";
-            this.UsrBox.Visible = false;
-            this.UsrBox.TextChanged += new System.EventHandler(this.UsrBox_TextChanged);
-            // 
-            // ResBox
-            // 
-            this.ResBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
-            this.ResBox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.ResBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.ResBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.ResBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            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, 24);
-            this.ResBox.TabIndex = 9;
-            this.ResBox.Text = "0";
-            this.ResBox.Visible = false;
-            this.ResBox.TextChanged += new System.EventHandler(this.ResBox_TextChanged);
-            // 
             // TextureResTextBox
             // 
             this.TextureResTextBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
@@ -479,35 +247,12 @@ namespace AndroidSideloader
             this.TextureResTextBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.TextureResTextBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.TextureResTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.TextureResTextBox.Location = new System.Drawing.Point(13, 152);
+            this.TextureResTextBox.Location = new System.Drawing.Point(38, 436);
             this.TextureResTextBox.Name = "TextureResTextBox";
-            this.TextureResTextBox.Size = new System.Drawing.Size(167, 24);
+            this.TextureResTextBox.Size = new System.Drawing.Size(111, 24);
             this.TextureResTextBox.TabIndex = 3;
             this.TextureResTextBox.Text = "0";
             // 
-            // QURfrRt
-            // 
-            this.QURfrRt.BackColor = global::AndroidSideloader.Properties.Settings.Default.ComboBoxColor;
-            this.QURfrRt.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.QURfrRt.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.QURfrRt.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ComboBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.QURfrRt.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.QURfrRt.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.QURfrRt.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.QURfrRt.FormattingEnabled = true;
-            this.QURfrRt.Items.AddRange(new object[] {
-            "0",
-            "72",
-            "90",
-            "120"});
-            this.QURfrRt.Location = new System.Drawing.Point(13, 555);
-            this.QURfrRt.Name = "QURfrRt";
-            this.QURfrRt.Size = new System.Drawing.Size(170, 26);
-            this.QURfrRt.TabIndex = 13;
-            this.QURfrRt.Text = "0";
-            this.QURfrRt.Visible = false;
-            this.QURfrRt.SelectedIndexChanged += new System.EventHandler(this.QURfrRt_SelectedIndexChanged);
-            // 
             // RefreshRateComboBox
             // 
             this.RefreshRateComboBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
@@ -521,12 +266,11 @@ namespace AndroidSideloader
             "72",
             "90",
             "120"});
-            this.RefreshRateComboBox.Location = new System.Drawing.Point(13, 65);
+            this.RefreshRateComboBox.Location = new System.Drawing.Point(38, 325);
             this.RefreshRateComboBox.Name = "RefreshRateComboBox";
-            this.RefreshRateComboBox.Size = new System.Drawing.Size(346, 26);
+            this.RefreshRateComboBox.Size = new System.Drawing.Size(232, 26);
             this.RefreshRateComboBox.TabIndex = 0;
             this.RefreshRateComboBox.Text = "Select refresh rate";
-            this.RefreshRateComboBox.SelectedIndexChanged += new System.EventHandler(this.RefreshRateComboBox_SelectedIndexChanged);
             // 
             // button1
             // 
@@ -538,10 +282,10 @@ namespace AndroidSideloader
             this.button1.ForeColor = System.Drawing.Color.White;
             this.button1.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.button1.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.button1.Location = new System.Drawing.Point(189, 152);
+            this.button1.Location = new System.Drawing.Point(185, 434);
             this.button1.Name = "button1";
             this.button1.Radius = 5;
-            this.button1.Size = new System.Drawing.Size(170, 25);
+            this.button1.Size = new System.Drawing.Size(85, 25);
             this.button1.Stroke = true;
             this.button1.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
             this.button1.TabIndex = 19;
@@ -549,27 +293,6 @@ namespace AndroidSideloader
             this.button1.Transparency = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
-            // WifiWake
-            // 
-            this.WifiWake.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.WifiWake.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.WifiWake.BackColor = System.Drawing.Color.Transparent;
-            this.WifiWake.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.WifiWake.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.WifiWake.ForeColor = System.Drawing.Color.White;
-            this.WifiWake.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.WifiWake.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.WifiWake.Location = new System.Drawing.Point(189, 180);
-            this.WifiWake.Name = "WifiWake";
-            this.WifiWake.Radius = 5;
-            this.WifiWake.Size = new System.Drawing.Size(170, 25);
-            this.WifiWake.Stroke = true;
-            this.WifiWake.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.WifiWake.TabIndex = 20;
-            this.WifiWake.Text = "ENABLE WIFI WAKE";
-            this.WifiWake.Transparency = false;
-            this.WifiWake.Click += new System.EventHandler(this.WifiWake_Click);
-            // 
             // questVids
             // 
             this.questVids.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
@@ -580,14 +303,14 @@ namespace AndroidSideloader
             this.questVids.ForeColor = System.Drawing.Color.White;
             this.questVids.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.questVids.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.questVids.Location = new System.Drawing.Point(189, 265);
+            this.questVids.Location = new System.Drawing.Point(72, 178);
             this.questVids.Name = "questVids";
             this.questVids.Radius = 5;
-            this.questVids.Size = new System.Drawing.Size(167, 25);
+            this.questVids.Size = new System.Drawing.Size(165, 25);
             this.questVids.Stroke = true;
             this.questVids.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
             this.questVids.TabIndex = 21;
-            this.questVids.Text = "VIDEOSHOTS";
+            this.questVids.Text = "RECORDINGS";
             this.questVids.Transparency = false;
             this.questVids.Click += new System.EventHandler(this.questVids_Click);
             // 
@@ -601,7 +324,7 @@ namespace AndroidSideloader
             this.questPics.ForeColor = System.Drawing.Color.White;
             this.questPics.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.questPics.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.questPics.Location = new System.Drawing.Point(15, 265);
+            this.questPics.Location = new System.Drawing.Point(72, 124);
             this.questPics.Name = "questPics";
             this.questPics.Radius = 5;
             this.questPics.Size = new System.Drawing.Size(165, 25);
@@ -612,69 +335,6 @@ namespace AndroidSideloader
             this.questPics.Transparency = false;
             this.questPics.Click += new System.EventHandler(this.questPics_Click);
             // 
-            // QUEnable
-            // 
-            this.QUEnable.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.QUEnable.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.QUEnable.BackColor = System.Drawing.Color.Transparent;
-            this.QUEnable.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.QUEnable.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.QUEnable.ForeColor = System.Drawing.Color.White;
-            this.QUEnable.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.QUEnable.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.QUEnable.Location = new System.Drawing.Point(189, 606);
-            this.QUEnable.Name = "QUEnable";
-            this.QUEnable.Radius = 5;
-            this.QUEnable.Size = new System.Drawing.Size(170, 25);
-            this.QUEnable.Stroke = true;
-            this.QUEnable.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.QUEnable.TabIndex = 24;
-            this.QUEnable.Text = "APPLY";
-            this.QUEnable.Transparency = false;
-            this.QUEnable.Click += new System.EventHandler(this.QUEnable_Click);
-            // 
-            // deleteButton
-            // 
-            this.deleteButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.deleteButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.deleteButton.BackColor = System.Drawing.Color.Transparent;
-            this.deleteButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.deleteButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.deleteButton.ForeColor = System.Drawing.Color.White;
-            this.deleteButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.deleteButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.deleteButton.Location = new System.Drawing.Point(13, 606);
-            this.deleteButton.Name = "deleteButton";
-            this.deleteButton.Radius = 5;
-            this.deleteButton.Size = new System.Drawing.Size(167, 25);
-            this.deleteButton.Stroke = true;
-            this.deleteButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.deleteButton.TabIndex = 25;
-            this.deleteButton.Text = "DELETE SAVED";
-            this.deleteButton.Transparency = false;
-            this.deleteButton.Click += new System.EventHandler(this.DeleteButton_Click);
-            // 
-            // ResetQU
-            // 
-            this.ResetQU.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.ResetQU.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.ResetQU.BackColor = System.Drawing.Color.Transparent;
-            this.ResetQU.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.ResetQU.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.ResetQU.ForeColor = System.Drawing.Color.White;
-            this.ResetQU.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.ResetQU.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.ResetQU.Location = new System.Drawing.Point(189, 555);
-            this.ResetQU.Name = "ResetQU";
-            this.ResetQU.Radius = 5;
-            this.ResetQU.Size = new System.Drawing.Size(168, 28);
-            this.ResetQU.Stroke = true;
-            this.ResetQU.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.ResetQU.TabIndex = 26;
-            this.ResetQU.Text = "RESET ALL FIELDS";
-            this.ResetQU.Transparency = false;
-            this.ResetQU.Click += new System.EventHandler(this.ResetQU_click);
-            // 
             // button3
             // 
             this.button3.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
@@ -685,7 +345,7 @@ namespace AndroidSideloader
             this.button3.ForeColor = System.Drawing.Color.White;
             this.button3.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.button3.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.button3.Location = new System.Drawing.Point(278, 700);
+            this.button3.Location = new System.Drawing.Point(194, 38);
             this.button3.Name = "button3";
             this.button3.Radius = 5;
             this.button3.Size = new System.Drawing.Size(81, 25);
@@ -696,54 +356,51 @@ namespace AndroidSideloader
             this.button3.Transparency = false;
             this.button3.Click += new System.EventHandler(this.button3_Click);
             // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.BackColor = System.Drawing.Color.Transparent;
+            this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label3.ForeColor = System.Drawing.Color.LightSteelBlue;
+            this.label3.Location = new System.Drawing.Point(37, 206);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(235, 16);
+            this.label3.TabIndex = 28;
+            this.label3.Text = "Exports to: Desktop\\Quest Recordings";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+            // 
             // QuestForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
             this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes_1_1_1_0_0_0_1__000000_212121;
-            this.ClientSize = new System.Drawing.Size(370, 737);
+            this.ClientSize = new System.Drawing.Size(309, 486);
+            this.Controls.Add(this.label3);
             this.Controls.Add(this.button3);
-            this.Controls.Add(this.ResetQU);
-            this.Controls.Add(this.deleteButton);
-            this.Controls.Add(this.QUEnable);
             this.Controls.Add(this.questPics);
             this.Controls.Add(this.questVids);
-            this.Controls.Add(this.WifiWake);
             this.Controls.Add(this.button1);
-            this.Controls.Add(this.label15);
             this.Controls.Add(this.label14);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.splitter1);
             this.Controls.Add(this.DeleteShots);
-            this.Controls.Add(this.QUon);
-            this.Controls.Add(this.label13);
-            this.Controls.Add(this.label4);
             this.Controls.Add(this.label16);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label11);
             this.Controls.Add(this.label12);
-            this.Controls.Add(this.label3);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.CPUComboBox);
             this.Controls.Add(this.GPUComboBox);
-            this.Controls.Add(this.label7);
-            this.Controls.Add(this.label8);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.label6);
-            this.Controls.Add(this.label5);
             this.Controls.Add(this.ResolutionLabel);
             this.Controls.Add(this.GlobalUsername);
-            this.Controls.Add(this.FOVy);
-            this.Controls.Add(this.FOVx);
-            this.Controls.Add(this.UsrBox);
-            this.Controls.Add(this.ResBox);
             this.Controls.Add(this.TextureResTextBox);
-            this.Controls.Add(this.QURfrRt);
             this.Controls.Add(this.RefreshRateComboBox);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MaximumSize = new System.Drawing.Size(386, 776);
-            this.MinimumSize = new System.Drawing.Size(386, 776);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximumSize = new System.Drawing.Size(325, 525);
+            this.MinimumSize = new System.Drawing.Size(325, 525);
             this.Name = "QuestForm";
             this.ShowIcon = false;
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
@@ -765,37 +422,19 @@ namespace AndroidSideloader
         private System.Windows.Forms.ComboBox CPUComboBox;
         private Label label1;
         private Label label2;
-        private Label label3;
-        private Label label4;
-        private ComboBox QURfrRt;
-        private TextBox ResBox;
-        private TextBox UsrBox;
-        private TextBox FOVx;
-        private TextBox FOVy;
-        private Label label5;
-        private Label label6;
-        private Label label7;
-        private Label label8;
-        private Label label9;
         private Label label11;
-        private CheckBox QUon;
         private Label label12;
-        private Label label13;
         private CheckBox DeleteShots;
         private Splitter splitter1;
         private Label label10;
         private Label label14;
-        private Label label15;
         private Label label16;
         private TextBox GlobalUsername;
         private RoundButton button1;
-        private RoundButton WifiWake;
         private RoundButton questVids;
         private RoundButton questPics;
-        private RoundButton QUEnable;
-        private RoundButton deleteButton;
-        private RoundButton ResetQU;
         private RoundButton button3;
+        private Label label3;
     }
 
 }

QuestForm.cs

@@ -9,7 +9,6 @@ namespace AndroidSideloader
         public static int length = 0;
         public static string[] result;
         public bool settingsexist = false;
-        public static bool QUSon = false;
         public bool delsh = false;
         public QuestForm()
         {
@@ -24,7 +23,6 @@ namespace AndroidSideloader
             //Quest 2 settings, might remove them in the future since some of them are broken
             if (RefreshRateComboBox.SelectedIndex != -1)
             {
-                ADB.WakeDevice();
                 _ = ADB.RunAdbCommandToString($"shell setprop debug.oculus.refreshRate {RefreshRateComboBox.SelectedItem}");
                 _ = ADB.RunAdbCommandToString($"shell settings put global 90hz_global {RefreshRateComboBox.SelectedIndex}");
                 _ = ADB.RunAdbCommandToString($"shell settings put global 90hzglobal {RefreshRateComboBox.SelectedIndex}");
@@ -33,7 +31,6 @@ namespace AndroidSideloader
 
             if (TextureResTextBox.Text.Length > 0)
             {
-                ADB.WakeDevice();
                 _ = int.TryParse(TextureResTextBox.Text, out _);
                 _ = ADB.RunAdbCommandToString($"shell settings put global texture_size_Global {TextureResTextBox.Text}");
                 _ = ADB.RunAdbCommandToString($"shell setprop debug.oculus.textureWidth {TextureResTextBox.Text}");
@@ -66,68 +63,11 @@ namespace AndroidSideloader
         }
 
 
-
-        public void ResetQU_click(object sender, EventArgs e)
-        {
-            ResBox.Text = "0";
-            UsrBox.Text = "Change Me";
-            FOVx.Text = "0";
-            FOVy.Text = "0";
-            QURfrRt.SelectedIndex = 0;
-        }
-
         private void DeleteShots_CheckedChanged(object sender, EventArgs e)
         {
             delsh = DeleteShots.Checked;
         }
-        private void QUon_CheckedChanged(object sender, EventArgs e)
-        {
-            if (QUon.Checked)
-            {
-                ResBox.Visible = true;
-                UsrBox.Visible = true;
-                FOVx.Visible = true;
-                FOVy.Visible = true;
-                QURfrRt.Visible = true;
-                ResetQU.Visible = true;
-                QUEnable.Visible = true;
-                label5.Visible = true;
-                label6.Visible = true;
-                label7.Visible = true;
-                label8.Visible = true;
-                label9.Visible = true;
-                label10.Visible = true;
-                deleteButton.Visible = true;
-                ResBox.Text = Properties.Settings.Default.QUres;
-                UsrBox.Text = Properties.Settings.Default.QUname;
-                FOVy.Text = Properties.Settings.Default.QUy;
-                FOVx.Text = Properties.Settings.Default.QUx;
-                QURfrRt.SelectedValue = Properties.Settings.Default.QUhz;
-                Properties.Settings.Default.QUturnedon = true;
-            }
-            else if (!QUon.Checked)
-            {
-                ResBox.Visible = false;
-                UsrBox.Visible = false;
-                FOVx.Visible = false;
-                FOVy.Visible = false;
-                QURfrRt.Visible = false;
-                ResetQU.Visible = false;
-                QUEnable.Visible = false;
-                label5.Visible = false;
-                label6.Visible = false;
-                label7.Visible = false;
-                label8.Visible = false;
-                label9.Visible = false;
-                label10.Visible = false;
-                deleteButton.Visible = false;
-                Properties.Settings.Default.QUturnedon = false;
-                _ = MessageBox.Show("Ok, Deleted your custom settings file.\nIf you would like to re-enable return here and apply settings again");
-                File.Delete($"{Environment.CurrentDirectory}\\Config.Json");
-                File.Delete($"{Environment.CurrentDirectory}\\delete_settings");
-            }
 
-        }
         private static readonly Random random = new Random();
         private static readonly object syncLock = new object();
         public static int RandomNumber(int min, int max)
@@ -137,60 +77,12 @@ namespace AndroidSideloader
                 return random.Next(min, max);
             }
         }
-        private void QUEnable_Click(object sender, EventArgs e)
-        {
 
-            settingsexist = true;
-            _ = MessageBox.Show("OK, any -QU packages installed will have these settings applied!\nTo delete settings: goto main app window, select a game with top menu, and click \"Remove QU Setting\"");
-            if (QUon.Checked)
-            {
-                Properties.Settings.Default.QUturnedon = true;
-                Random r = new Random();
-
-                int x = r.Next(999999999);
-                int y = r.Next(9999999);
-
-                long sum = (y * (long)1000000000) + x;
-
-                int x2 = r.Next(999999999);
-                int y2 = r.Next(9999999);
-
-                long sum2 = (y2 * (long)1000000000) + x2;
-
-                QUSon = true;
-
-                string selected = QURfrRt.GetItemText(QURfrRt.SelectedItem);
-
-                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($"{Properties.Settings.Default.MainDir}\\delete_settings", "");
-                string boff = Properties.Settings.Default.QUStringF + Properties.Settings.Default.QUString;
-                File.WriteAllText($"{Properties.Settings.Default.MainDir}\\config.json", boff);
-            }
-            else
-            {
-                Properties.Settings.Default.QUturnedon = false;
-            }
-
-
-
-        }
 
 
 
         private void QuestForm_FormClosed(object sender, FormClosedEventArgs e)
         {
-            if (QUon.Checked)
-            {
-                Properties.Settings.Default.QUsett = true;
-                Properties.Settings.Default.Save();
-            }
-            if (!QUon.Checked)
-            {
-                Properties.Settings.Default.QUsett = false;
-                Properties.Settings.Default.Save();
-            }
             if (DeleteShots.Checked)
             {
                 Properties.Settings.Default.delsh = true;
@@ -205,54 +97,9 @@ namespace AndroidSideloader
         private void QuestForm_Load(object sender, EventArgs e)
         {
             DeleteShots.Checked = Properties.Settings.Default.delsh;
-            if (Properties.Settings.Default.QUsett)
-            {
-                ResBox.Text = Properties.Settings.Default.QUres;
-                UsrBox.Text = Properties.Settings.Default.QUname;
-                FOVy.Text = Properties.Settings.Default.QUy;
-                FOVx.Text = Properties.Settings.Default.QUx;
-                QURfrRt.Text = Properties.Settings.Default.QUhz;
-                QUon.Checked = true;
-                if (settingsexist)
-                {
-                    QUSon = true;
-                }
-            }
             GlobalUsername.Text = Properties.Settings.Default.GlobalUsername;
         }
 
-        private void ResBox_TextChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.QUres = ResBox.Text;
-            Properties.Settings.Default.Save();
-
-        }
-
-        private void UsrBox_TextChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.QUname = UsrBox.Text;
-            Properties.Settings.Default.Save();
-        }
-
-        private void FOVx_TextChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.QUx = FOVx.Text;
-            Properties.Settings.Default.Save();
-        }
-
-        private void FOVy_TextChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.QUy = FOVy.Text;
-            Properties.Settings.Default.Save();
-        }
-
-        private void QURfrRt_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-            string selected = QURfrRt.GetItemText(QURfrRt.SelectedItem);
-            Properties.Settings.Default.QUhz = selected;
-            Properties.Settings.Default.Save();
-        }
         private void DeleteButton_Click(object sender, EventArgs e)
         {
 
@@ -269,8 +116,7 @@ namespace AndroidSideloader
             }
 
             _ = MessageBox.Show("Please wait until you get the message that the transfer has finished.");
-            ADB.WakeDevice();
-            Program.form.ChangeTitle("Pulling files...");
+            Program.form.changeTitle("Pulling files...");
             _ = ADB.RunAdbCommandToString($"pull \"/sdcard/Oculus/Screenshots\" \"{path}\\Quest ScreenShots\"");
             if (delsh)
             {
@@ -282,20 +128,19 @@ namespace AndroidSideloader
                 }
             }
             _ = MessageBox.Show("Transfer finished! ScreenShots can be found in a folder named Quest Screenshots on your desktop!");
-            Program.form.ChangeTitle("Done!");
+            Program.form.changeTitle("Done!");
         }
         private void questVids_Click(object sender, EventArgs e)
         {
             string path = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-            if (!Directory.Exists($"{path}\\Quest VideoShots"))
+            if (!Directory.Exists($"{path}\\Quest Recordings"))
             {
-                _ = Directory.CreateDirectory($"{path}\\Quest VideoShots");
+                _ = Directory.CreateDirectory($"{path}\\Quest Recordings");
             }
 
-            _ = MessageBox.Show("Please wait until you get the message that the transfer has finished.");
-            ADB.WakeDevice();
-            Program.form.ChangeTitle("Pulling files...");
-            _ = ADB.RunAdbCommandToString($"pull \"/sdcard/Oculus/Videoshots\" \"{path}\\Quest VideoShots\"");
+            _ = MessageBox.Show("Please wait until you get the message that the transfer has finished.");;
+            Program.form.changeTitle("Pulling files...");
+            _ = ADB.RunAdbCommandToString($"pull \"/sdcard/Oculus/Videoshots\" \"{path}\\Quest Recordings\"");
             if (delsh)
             {
                 DialogResult dialogResult = MessageBox.Show("You have chosen to delete files from headset after transferring, so be sure to move them from your desktop to somewhere safe!", "Warning!", MessageBoxButtons.OKCancel);
@@ -305,8 +150,8 @@ namespace AndroidSideloader
                     _ = ADB.RunAdbCommandToString("shell mkdir /sdcard/Oculus/Videoshots");
                 }
             }
-            _ = MessageBox.Show("Transfer finished! VideoShots can be found in a folder named Quest VideoShots on your desktop!");
-            Program.form.ChangeTitle("Done!");
+            _ = MessageBox.Show("Transfer finished! Recordings can be found in a folder named Quest Recordings on your desktop!");
+            Program.form.changeTitle("Done!");
         }
         private void button3_Click(object sender, EventArgs e)
         {
@@ -339,33 +184,11 @@ namespace AndroidSideloader
             return base.ProcessDialogKey(keyData);
         }
 
-        private void WifiWake_Click(object sender, EventArgs e)
-        {
-            _ = ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
-            _ = ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
-            _ = MessageBox.Show("Wake on Wifi enabled!\n\nNOTE: This requires having wireless ADB enabled to work. (Obviously)");
-        }
-
         private void GlobalUsername_TextChanged(object sender, EventArgs e)
         {
             button3.Enabled = GlobalUsername.TextLength > 0;
             Properties.Settings.Default.GlobalUsername = GlobalUsername.Text;
             Properties.Settings.Default.Save();
         }
-
-        private void RefreshRateComboBox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void CPUComboBox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void GPUComboBox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
     }
 }

RCLONE.cs

@@ -10,7 +10,7 @@ namespace AndroidSideloader
 {
     internal class RCLONE
     {
-        //Kill all rclone, using a static rclone variable doesn't work for some reason #tofix
+        // Kill RCLONE Processes that were started from Rookie by looking for child processes.
         public static void killRclone()
         {
             var parentProcessId = Process.GetCurrentProcess().Id;
@@ -33,12 +33,12 @@ namespace AndroidSideloader
                 }
                 catch (Exception ex)
                 {
-                    // Handle exception if the process no longer exists
+                    _ = Logger.Log($"Exception occured while attempting to shut down RCLONE with exception message: {ex.Message}", LogLevel.ERROR);
                 }
             }
         }
 
-        //For custom configs that use a password
+        // For custom configs that use a password
         public static void Init()
         {
             string PwTxtPath = Path.Combine(Environment.CurrentDirectory, "rclone\\pw.txt");
@@ -48,7 +48,7 @@ namespace AndroidSideloader
             }
         }
 
-        //Change if you want to use a config
+        // Change if you want to use a config
         public static string downloadConfigPath = "vrp.download.config";
         public static string uploadConfigPath = "vrp.upload.config";
         public static string rclonepw = "";
@@ -56,7 +56,7 @@ namespace AndroidSideloader
 
         private static readonly Process rclone = new Process();
 
-        //Run rclone command
+        // Run an RCLONE Command that accesses the Download Config.
         public static ProcessOutput runRcloneCommand_DownloadConfig(string command)
         {
             if (MainForm.isOffline)
@@ -65,17 +65,17 @@ namespace AndroidSideloader
             }
 
             ProcessOutput prcoutput = new ProcessOutput();
-            //Rclone output is unicode, else it will show garbage instead of unicode characters
+            // Rclone output is unicode, else it will show garbage instead of unicode characters
             rclone.StartInfo.StandardOutputEncoding = Encoding.UTF8;
             string originalCommand = command;
 
-            //set configpath if there is any
+            // set configpath if there is any
             if (downloadConfigPath.Length > 0)
             {
                 command += $" --config {downloadConfigPath}";
             }
 
-            //set rclonepw
+            // set rclonepw
             if (rclonepw.Length > 0)
             {
                 command += " --ask-password=false";
@@ -101,12 +101,11 @@ namespace AndroidSideloader
             rclone.StartInfo.RedirectStandardOutput = true;
             rclone.StartInfo.WorkingDirectory = Environment.CurrentDirectory + "\\rclone";
             rclone.StartInfo.CreateNoWindow = true;
-            //On debug we want to see when rclone is open
-            if (MainForm.debugMode == true)
+            // Display RCLONE Window if the binary is being run in Debug Mode.
+            if (MainForm.debugMode)
             {
                 rclone.StartInfo.CreateNoWindow = false;
             }
-
             rclone.StartInfo.UseShellExecute = false;
             _ = rclone.Start();
             rclone.StandardInput.WriteLine(command);
@@ -126,7 +125,7 @@ namespace AndroidSideloader
                 return new ProcessOutput("Download failed.", "");
             }
 
-            //if there is one of these errors, we switch the mirrors
+            // Switch mirror upon matching error output.
             if (error.Contains("400 Bad Request") || error.Contains("cannot fetch token") || error.Contains("authError") || error.Contains("quota") || error.Contains("exceeded") || error.Contains("directory not found") || error.Contains("Failed to"))
             {
                 string oldRemote = MainForm.currentRemote;
@@ -151,7 +150,7 @@ namespace AndroidSideloader
             {
                 if (!string.IsNullOrWhiteSpace(error))
                 {
-                    _ = Logger.Log($"Rclone error: {error}\n", "ERROR");
+                    _ = Logger.Log($"Rclone error: {error}\n", LogLevel.ERROR);    
                 }
 
                 if (!string.IsNullOrWhiteSpace(output))
@@ -165,10 +164,10 @@ namespace AndroidSideloader
         public static ProcessOutput runRcloneCommand_UploadConfig(string command)
         {
             ProcessOutput prcoutput = new ProcessOutput();
-            //Rclone output is unicode, else it will show garbage instead of unicode characters
+            // Rclone output is unicode, else it will show garbage instead of unicode characters
             rclone.StartInfo.StandardOutputEncoding = Encoding.UTF8;
 
-            //set configpath if there is any
+            // set configpath if there is any
             if (uploadConfigPath.Length > 0)
             {
                 command += $" --config {uploadConfigPath}";
@@ -196,12 +195,11 @@ namespace AndroidSideloader
             rclone.StartInfo.RedirectStandardOutput = true;
             rclone.StartInfo.WorkingDirectory = Environment.CurrentDirectory + "\\rclone";
             rclone.StartInfo.CreateNoWindow = true;
-            //On debug we want to see when rclone is open
-            if (MainForm.debugMode == true)
+            // Display RCLONE Window if the binary is being run in Debug Mode.
+            if (MainForm.debugMode)
             {
                 rclone.StartInfo.CreateNoWindow = false;
             }
-
             rclone.StartInfo.UseShellExecute = false;
             _ = rclone.Start();
             rclone.StandardInput.WriteLine(command);
@@ -212,10 +210,10 @@ namespace AndroidSideloader
             string error = rclone.StandardError.ReadToEnd();
             rclone.WaitForExit();
 
-            //if there is one of these errors, we switch the mirrors
+            // if there is one of these errors, we switch the mirrors
             if (error.Contains("400 Bad Request") || error.Contains("cannot fetch token") || error.Contains("authError") || error.Contains("quota") || error.Contains("exceeded") || error.Contains("directory not found") || error.Contains("Failed to"))
             {
-                _ = Logger.Log(error, "ERROR");
+                _ = Logger.Log(error, LogLevel.ERROR);
                 return new ProcessOutput("Upload Failed.", "Upload failed.");
             }
             else
@@ -228,7 +226,7 @@ namespace AndroidSideloader
             {
                 if (!string.IsNullOrWhiteSpace(error))
                 {
-                    _ = Logger.Log($"Rclone error: {error}\n", "ERROR");
+                    _ = Logger.Log($"Rclone error: {error}\n", LogLevel.ERROR);
                 }
 
                 if (!string.IsNullOrWhiteSpace(output))
@@ -247,7 +245,7 @@ namespace AndroidSideloader
             }
 
             ProcessOutput prcoutput = new ProcessOutput();
-            //Rclone output is unicode, else it will show garbage instead of unicode characters
+            // Rclone output is unicode, else it will show garbage instead of unicode characters
             rclone.StartInfo.StandardOutputEncoding = Encoding.UTF8;
 
             string logcmd = Utilities.StringUtilities.RemoveEverythingBeforeFirst(command, "rclone.exe");
@@ -265,7 +263,7 @@ namespace AndroidSideloader
 
             //set http source & args
             command += $" --http-url {MainForm.PublicConfigFile.BaseUri} {MainForm.PublicMirrorExtraArgs}";
-
+          
             rclone.StartInfo.FileName = Environment.CurrentDirectory + "\\rclone\\rclone.exe";
             rclone.StartInfo.Arguments = command;
             rclone.StartInfo.RedirectStandardInput = true;
@@ -273,13 +271,11 @@ namespace AndroidSideloader
             rclone.StartInfo.RedirectStandardOutput = true;
             rclone.StartInfo.WorkingDirectory = Environment.CurrentDirectory + "\\rclone";
             rclone.StartInfo.CreateNoWindow = true;
-
-            //On debug we want to see when rclone is open
-            if (MainForm.debugMode == true)
+            // Display RCLONE Window if the binary is being run in Debug Mode.
+            if (MainForm.debugMode)
             {
                 rclone.StartInfo.CreateNoWindow = false;
             }
-
             rclone.StartInfo.UseShellExecute = false;
             _ = rclone.Start();
             rclone.StandardInput.WriteLine(command);
@@ -296,10 +292,15 @@ namespace AndroidSideloader
                                         "NOT ENOUGH SPACE",
                                         MessageBoxButtons.OK,
                                         MessageBoxIcon.Error);
-                return new ProcessOutput("Download failed.", "");
+                return new ProcessOutput("Download failed.", string.Empty);
             }
 
-            if (error.Contains("400 Bad Request")
+            if (error.Contains("Only one usage of each socket address (protocol/network address/port) is normally permitted")) {
+                _ = Logger.Log(error, LogLevel.ERROR);
+                return new ProcessOutput("Failed to fetch from public mirror.", "Failed to fetch from public mirror.\nYou may have a running RCLONE Task!\nCheck your Task Manager, Sort by Network Usage, and kill the process Rsync for Cloud Storage/Rclone");
+            }
+
+            else if (error.Contains("400 Bad Request")
                 || error.Contains("cannot fetch token")
                 || error.Contains("authError")
                 || error.Contains("quota")
@@ -307,7 +308,7 @@ namespace AndroidSideloader
                 || error.Contains("directory not found")
                 || error.Contains("Failed to"))
             {
-                _ = Logger.Log(error, "ERROR");
+                _ = Logger.Log(error, LogLevel.ERROR);
                 return new ProcessOutput("Failed to fetch from public mirror.", "Failed to fetch from public mirror.");
             }
             else
@@ -320,7 +321,7 @@ namespace AndroidSideloader
             {
                 if (!string.IsNullOrWhiteSpace(error))
                 {
-                    _ = Logger.Log($"Rclone error: {error}\n", "ERROR");
+                    _ = Logger.Log($"Rclone error: {error}\n", LogLevel.ERROR);
                 }
 
                 if (!string.IsNullOrWhiteSpace(output))

README.md

@@ -1,8 +1,8 @@
 # androidsideloader
-![GitHub last commit](https://img.shields.io/github/last-commit/nerdunit/androidsideloader)
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/nerdunit/androidsideloader)
-[![Downloads](https://img.shields.io/github/downloads/nerdunit/androidsideloader/total.svg)](https://github.com/nerdunit/androidsideloader/releases)
-![Issues](https://img.shields.io/github/issues/nerdunit/androidsideloader)
+![GitHub last commit](https://img.shields.io/github/last-commit/VRPirates/rookie)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/VRPirates/rookie)
+[![Downloads](https://img.shields.io/github/downloads/VRPirates/rookie/total.svg)](https://github.com/VRPirates/rookie/releases)
+![Issues](https://img.shields.io/github/issues/VRPirates/rookie)
 
 androidsideloader uses the GPL license, any forks of it must have their source code made public on the internet.
 
@@ -10,6 +10,6 @@ androidsideloader uses the GPL license, any forks of it must have their source c
 
 This app may be buggy and have problems.
 
-### This app might get detected as malware, however both the sideloader and the sideloader launcher are open source.  And obviously, it isn't.
-See:
-https://www.virustotal.com/gui/file/977105693610cf360fc29339b918e224180ba393ba05a64b6255af3845cbf376/relations
+### This app might get detected as malware, however both the sideloader and the sideloader launcher are open source.
+Rookie 1.25.1 VirusTotal Scan (1/72)-
+https://www.virustotal.com/gui/file/dc3ed59057d508646a06a978c44ae72d473fd678129483ab186202046cbc713f

SettingsForm.Designer.cs

@@ -29,6 +29,7 @@ namespace AndroidSideloader
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
             this.checkForUpdatesCheckBox = new System.Windows.Forms.CheckBox();
             this.enableMessageBoxesCheckBox = new System.Windows.Forms.CheckBox();
             this.deleteAfterInstallCheckBox = new System.Windows.Forms.CheckBox();
@@ -49,6 +50,9 @@ namespace AndroidSideloader
             this.btnUploadDebug = new AndroidSideloader.RoundButton();
             this.resetSettingsButton = new AndroidSideloader.RoundButton();
             this.applyButton = new AndroidSideloader.RoundButton();
+            this.virtualFilesystemCompatibilityCheckbox = new System.Windows.Forms.CheckBox();
+            this.openBackupDirectory = new AndroidSideloader.RoundButton();
+            this.openDownloadDirectory = new AndroidSideloader.RoundButton();
             this.SuspendLayout();
             // 
             // checkForUpdatesCheckBox
@@ -219,7 +223,7 @@ namespace AndroidSideloader
             this.setBackupDirectory.ForeColor = System.Drawing.Color.White;
             this.setBackupDirectory.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.setBackupDirectory.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.setBackupDirectory.Location = new System.Drawing.Point(27, 514);
+            this.setBackupDirectory.Location = new System.Drawing.Point(27, 542);
             this.setBackupDirectory.Name = "setBackupDirectory";
             this.setBackupDirectory.Radius = 5;
             this.setBackupDirectory.Size = new System.Drawing.Size(285, 31);
@@ -240,7 +244,7 @@ namespace AndroidSideloader
             this.setDownloadDirectory.ForeColor = System.Drawing.Color.White;
             this.setDownloadDirectory.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.setDownloadDirectory.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.setDownloadDirectory.Location = new System.Drawing.Point(27, 477);
+            this.setDownloadDirectory.Location = new System.Drawing.Point(27, 505);
             this.setDownloadDirectory.Name = "setDownloadDirectory";
             this.setDownloadDirectory.Radius = 5;
             this.setDownloadDirectory.Size = new System.Drawing.Size(285, 31);
@@ -261,7 +265,7 @@ namespace AndroidSideloader
             this.btnOpenDebug.ForeColor = System.Drawing.Color.White;
             this.btnOpenDebug.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.btnOpenDebug.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.btnOpenDebug.Location = new System.Drawing.Point(26, 350);
+            this.btnOpenDebug.Location = new System.Drawing.Point(26, 378);
             this.btnOpenDebug.Name = "btnOpenDebug";
             this.btnOpenDebug.Radius = 5;
             this.btnOpenDebug.Size = new System.Drawing.Size(285, 31);
@@ -282,7 +286,7 @@ namespace AndroidSideloader
             this.btnResetDebug.ForeColor = System.Drawing.Color.White;
             this.btnResetDebug.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.btnResetDebug.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.btnResetDebug.Location = new System.Drawing.Point(26, 387);
+            this.btnResetDebug.Location = new System.Drawing.Point(26, 415);
             this.btnResetDebug.Name = "btnResetDebug";
             this.btnResetDebug.Radius = 5;
             this.btnResetDebug.Size = new System.Drawing.Size(285, 31);
@@ -303,7 +307,7 @@ namespace AndroidSideloader
             this.btnUploadDebug.ForeColor = System.Drawing.Color.White;
             this.btnUploadDebug.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.btnUploadDebug.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.btnUploadDebug.Location = new System.Drawing.Point(26, 424);
+            this.btnUploadDebug.Location = new System.Drawing.Point(26, 452);
             this.btnUploadDebug.Name = "btnUploadDebug";
             this.btnUploadDebug.Radius = 5;
             this.btnUploadDebug.Size = new System.Drawing.Size(285, 31);
@@ -324,7 +328,7 @@ namespace AndroidSideloader
             this.resetSettingsButton.ForeColor = System.Drawing.Color.White;
             this.resetSettingsButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.resetSettingsButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.resetSettingsButton.Location = new System.Drawing.Point(179, 297);
+            this.resetSettingsButton.Location = new System.Drawing.Point(179, 325);
             this.resetSettingsButton.Name = "resetSettingsButton";
             this.resetSettingsButton.Radius = 5;
             this.resetSettingsButton.Size = new System.Drawing.Size(133, 31);
@@ -348,7 +352,7 @@ namespace AndroidSideloader
             this.applyButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.applyButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
             this.applyButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.applyButton.Location = new System.Drawing.Point(27, 297);
+            this.applyButton.Location = new System.Drawing.Point(27, 325);
             this.applyButton.Name = "applyButton";
             this.applyButton.Radius = 5;
             this.applyButton.Size = new System.Drawing.Size(133, 31);
@@ -359,13 +363,72 @@ namespace AndroidSideloader
             this.applyButton.Transparency = false;
             this.applyButton.Click += new System.EventHandler(this.applyButton_Click);
             // 
+            // virtualFilesystemCompatibilityCheckbox
+            // 
+            this.virtualFilesystemCompatibilityCheckbox.AutoSize = true;
+            this.virtualFilesystemCompatibilityCheckbox.BackColor = System.Drawing.Color.Transparent;
+            this.virtualFilesystemCompatibilityCheckbox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.virtualFilesystemCompatibilityCheckbox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.virtualFilesystemCompatibilityCheckbox.Location = new System.Drawing.Point(11, 291);
+            this.virtualFilesystemCompatibilityCheckbox.Name = "virtualFilesystemCompatibilityCheckbox";
+            this.virtualFilesystemCompatibilityCheckbox.Size = new System.Drawing.Size(279, 22);
+            this.virtualFilesystemCompatibilityCheckbox.TabIndex = 26;
+            this.virtualFilesystemCompatibilityCheckbox.Text = "Enable Virtual Filesystem Compatibility";
+            this.virtualFilesystemCompatibilityCheckbox.UseVisualStyleBackColor = true;
+            this.virtualFilesystemCompatibilityCheckbox.CheckedChanged += new System.EventHandler(this.virtualFilesystemCompatibilityCheckbox_CheckedChanged);
+            // 
+            // openBackupDirectory
+            // 
+            this.openBackupDirectory.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.openBackupDirectory.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.openBackupDirectory.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.openBackupDirectory.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.openBackupDirectory.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
+            this.openBackupDirectory.ForeColor = System.Drawing.Color.White;
+            this.openBackupDirectory.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.openBackupDirectory.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.openBackupDirectory.Location = new System.Drawing.Point(27, 616);
+            this.openBackupDirectory.Name = "openBackupDirectory";
+            this.openBackupDirectory.Radius = 5;
+            this.openBackupDirectory.Size = new System.Drawing.Size(285, 31);
+            this.openBackupDirectory.Stroke = true;
+            this.openBackupDirectory.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
+            this.openBackupDirectory.TabIndex = 28;
+            this.openBackupDirectory.Text = "Open Backup Directory";
+            this.openBackupDirectory.Transparency = false;
+            this.openBackupDirectory.Click += new System.EventHandler(this.openBackupDirectory_Click);
+            // 
+            // openDownloadDirectory
+            // 
+            this.openDownloadDirectory.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.openDownloadDirectory.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.openDownloadDirectory.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.openDownloadDirectory.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.openDownloadDirectory.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
+            this.openDownloadDirectory.ForeColor = System.Drawing.Color.White;
+            this.openDownloadDirectory.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.openDownloadDirectory.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.openDownloadDirectory.Location = new System.Drawing.Point(27, 579);
+            this.openDownloadDirectory.Name = "openDownloadDirectory";
+            this.openDownloadDirectory.Radius = 5;
+            this.openDownloadDirectory.Size = new System.Drawing.Size(285, 31);
+            this.openDownloadDirectory.Stroke = true;
+            this.openDownloadDirectory.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
+            this.openDownloadDirectory.TabIndex = 27;
+            this.openDownloadDirectory.Text = "Open Download Directory";
+            this.openDownloadDirectory.Transparency = false;
+            this.openDownloadDirectory.Click += new System.EventHandler(this.openDownloadDirectory_Click);
+            // 
             // SettingsForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
-            this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes_1_1_1_0_0_0_1__000000_212121;
-            this.ClientSize = new System.Drawing.Size(339, 561);
+            this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
+            this.ClientSize = new System.Drawing.Size(339, 665);
+            this.Controls.Add(this.openBackupDirectory);
+            this.Controls.Add(this.openDownloadDirectory);
+            this.Controls.Add(this.virtualFilesystemCompatibilityCheckbox);
             this.Controls.Add(this.singleThread);
             this.Controls.Add(this.setBackupDirectory);
             this.Controls.Add(this.trailersOn);
@@ -387,6 +450,7 @@ namespace AndroidSideloader
             this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.Name = "SettingsForm";
             this.ShowIcon = false;
@@ -422,5 +486,8 @@ namespace AndroidSideloader
         private RoundButton setBackupDirectory;
         private System.Windows.Forms.FolderBrowserDialog backupDirectorySetter;
         private System.Windows.Forms.CheckBox singleThread;
+        private System.Windows.Forms.CheckBox virtualFilesystemCompatibilityCheckbox;
+        private RoundButton openBackupDirectory;
+        private RoundButton openDownloadDirectory;
     }
 }

SettingsForm.cs

@@ -33,6 +33,7 @@ namespace AndroidSideloader
             AutoReinstBox.Checked = Properties.Settings.Default.AutoReinstall;
             trailersOn.Checked = Properties.Settings.Default.TrailersOn;
             singleThread.Checked = Properties.Settings.Default.singleThreadMode;
+            virtualFilesystemCompatibilityCheckbox.Checked = Properties.Settings.Default.virtualFilesystemCompatibility;
             if (nodevicemodeBox.Checked)
             {
                 deleteAfterInstallCheckBox.Checked = false;
@@ -83,7 +84,7 @@ namespace AndroidSideloader
         private void applyButton_Click(object sender, EventArgs e)
         {
             Properties.Settings.Default.Save();
-            _ = FlexibleMessageBox.Show(this, "Settings applied!");
+            this.Close();
         }
 
         private void checkForUpdatesCheckBox_CheckedChanged(object sender, EventArgs e)
@@ -101,7 +102,7 @@ namespace AndroidSideloader
             Properties.Settings.Default.Reset();
             Properties.Settings.Default.customDownloadDir = false;
             Properties.Settings.Default.customBackupDir = false;
-            MainForm.BackupFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups");
+            MainForm.backupFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups");
             Properties.Settings.Default.downloadDir = Environment.CurrentDirectory.ToString();
             intSettings();
         }
@@ -193,7 +194,7 @@ namespace AndroidSideloader
             {
                 DialogResult dialogResult = FlexibleMessageBox.Show(this, "WARNING: This box enables automatic reinstall when installs fail,\ndue to some games not allowing " +
                     "access to their save data (less than 5%) this\noption can lead to losing your progress." +
-                    " However with this option\nchecked when installs fail you won't have to agree to a prompt to preform\nthe reinstall. " +
+                    " However with this option\nchecked when installs fail you won't have to agree to a prompt to perform\nthe reinstall. " +
                     "(ideal when installing from a queue).\n\nNOTE: If your usb/wireless adb connection is extremely slow this option can\ncause larger" +
                     "apk file installations to fail. Enable anyway?", "WARNING", MessageBoxButtons.OKCancel);
                 if (dialogResult == DialogResult.Cancel)
@@ -228,7 +229,7 @@ namespace AndroidSideloader
             {
                 Properties.Settings.Default.customBackupDir = true;
                 Properties.Settings.Default.backupDir = backupDirectorySetter.SelectedPath;
-                MainForm.BackupFolder = Properties.Settings.Default.backupDir;
+                MainForm.backupFolder = Properties.Settings.Default.backupDir;
                 Properties.Settings.Default.Save();
             }
         }
@@ -238,6 +239,24 @@ namespace AndroidSideloader
             Properties.Settings.Default.singleThreadMode = singleThread.Checked;
             Properties.Settings.Default.Save();
         }
+
+        private void virtualFilesystemCompatibilityCheckbox_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.virtualFilesystemCompatibility = virtualFilesystemCompatibilityCheckbox.Checked;
+            Properties.Settings.Default.Save();
+        }
+
+        private void openDownloadDirectory_Click(object sender, EventArgs e)
+        {
+            string pathToOpen = Properties.Settings.Default.customDownloadDir ? $"{Properties.Settings.Default.downloadDir}" : $"{Environment.CurrentDirectory}";
+            MainForm.OpenDirectory(pathToOpen);
+        }
+
+        private void openBackupDirectory_Click(object sender, EventArgs e)
+        {
+            string pathToOpen = Properties.Settings.Default.customBackupDir ? $"{Path.Combine((Properties.Settings.Default.backupDir), $"Rookie Backups")}" : $"{Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups")}";
+            MainForm.OpenDirectory(pathToOpen);
+        }
     }
 }
 

Sideloader.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Management;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
@@ -13,16 +14,36 @@ namespace AndroidSideloader
         public static string TempFolder = Path.Combine(Environment.CurrentDirectory, "temp");
         public static string CrashLogPath = "crashlog.txt";
 
-        public static string SpooferWarning = @"Please make sure you have installed:
-- APKTool
-- Java JDK
-- aapt
-And all of them added to PATH, without ANY of them, the spoofer won't work!";
+        public static void killWebView2()
+        {
+            var parentProcessId = Process.GetCurrentProcess().Id;
+            var processes = Process.GetProcessesByName("msedgewebview2");
+
+            foreach (var process in processes)
+            {
+                try
+                {
+                    using (ManagementObject obj = new ManagementObject($"win32_process.handle='{process.Id}'"))
+                    {
+                        obj.Get();
+                        var ppid = Convert.ToInt32(obj["ParentProcessId"]);
+
+                        if (ppid == parentProcessId)
+                        {
+                            process.Kill();
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _ = Logger.Log($"Exception occured while attempting to shut down WebView2 with exception message: {ex.Message}", LogLevel.ERROR);
+                }
+            }
+        }
 
         //push user.json to device (required for some devices like oculus quest)
         public static void PushUserJsons()
         {
-            ADB.WakeDevice();
             foreach (string userJson in UsernameForm.userJsons)
             {
                 UsernameForm.createUserJsonByName(Utilities.GeneralUtilities.randomString(16), userJson);
@@ -35,19 +56,21 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
         //public static List<string> InstalledPackageNames = new List<string>();        //Remove folder from device
         public static ProcessOutput RemoveFolder(string path)
         {
-            ADB.WakeDevice();
+            if (path == "/sdcard/Android/obb/" || path == "sdcard/Android/data/")
+            {
+                return null;
+            }
             return ADB.RunAdbCommandToString($"shell rm -r {path}");
         }
+
         public static ProcessOutput RemoveFile(string path)
         {
-            ADB.WakeDevice();
             return ADB.RunAdbCommandToString($"shell rm -f {path}");
         }
 
         //For games that require manual install, like having another folder that isnt an obb
         public static ProcessOutput RunADBCommandsFromFile(string path)
         {
-            ADB.WakeDevice();
             ProcessOutput output = new ProcessOutput();
             string[] commands = File.ReadAllLines(path);
             string currfolder = Path.GetDirectoryName(path);
@@ -67,7 +90,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                         : $"{Properties.Settings.Default.ADBPath}";
                     Regex rgx = new Regex(pattern);
                     string result = rgx.Replace(cmd, replacement);
-                    Program.form.ChangeTitle($"Running {result}");
+                    Program.form.changeTitle($"Running {result}");
                     _ = Logger.Log($"Logging command: {result} from file: {path}");
                     output += ADB.RunAdbCommandToStringWOADB(result, path);
                     if (output.Error.Contains("mkdir"))
@@ -108,7 +131,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                     RecursiveSideload(d);
                 }
             }
-            catch (Exception ex) { _ = Logger.Log(ex.Message, "ERROR"); }
+            catch (Exception ex) { _ = Logger.Log(ex.Message, LogLevel.ERROR); }
         }
 
         //Recursive copy any obb folder
@@ -126,14 +149,14 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                     RecursiveCopyOBB(d);
                 }
             }
-            catch (Exception ex) { _ = Logger.Log(ex.Message, "ERROR"); }
+            catch (Exception ex) { _ = Logger.Log(ex.Message, LogLevel.ERROR); }
         }
 
-        //uninstalls an app
+        // Removes the game package and its OBB + Data Folders.
         public static ProcessOutput UninstallGame(string packagename)
         {
             ProcessOutput output = ADB.UninstallPackage(packagename);
-            Program.form.ChangeTitle("");
+            Program.form.changeTitle("");
             _ = Sideloader.RemoveFolder("/sdcard/Android/obb/" + packagename);
             _ = Sideloader.RemoveFolder("/sdcard/Android/data/" + packagename);
             return output;
@@ -143,21 +166,20 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
         {
             if (!Properties.Settings.Default.customBackupDir)
             {
-                MainForm.BackupFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups");
+                MainForm.backupFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups");
             }
             else
             {
-                MainForm.BackupFolder = Path.Combine((Properties.Settings.Default.backupDir), $"Rookie Backups");
+                MainForm.backupFolder = Path.Combine((Properties.Settings.Default.backupDir), $"Rookie Backups");
             }
-            ADB.WakeDevice();
-            if (!Directory.Exists(MainForm.BackupFolder))
+            if (!Directory.Exists(MainForm.backupFolder))
             {
-                _ = Directory.CreateDirectory(MainForm.BackupFolder);
+                _ = Directory.CreateDirectory(MainForm.backupFolder);
             }
-            Program.form.ChangeTitle($"Attempting to backup any savedata to {MainForm.BackupFolder}\\Rookie Backups...");
+            Program.form.changeTitle($"Attempting to backup any savedata to {MainForm.backupFolder}\\Rookie Backups...");
             _ = new ProcessOutput("", "");
             string date_str = DateTime.Today.ToString("yyyy.MM.dd");
-            string CurrBackups = Path.Combine(MainForm.BackupFolder, date_str);
+            string CurrBackups = Path.Combine(MainForm.backupFolder, date_str);
             if (!Directory.Exists(CurrBackups))
             {
                 _ = Directory.CreateDirectory(CurrBackups);
@@ -167,7 +189,6 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
 
         public static ProcessOutput DeleteFile(string GameName)
         {
-            ADB.WakeDevice();
             ProcessOutput output = new ProcessOutput("", "");
 
             string packageName = Sideloader.gameNameToPackageName(GameName);
@@ -186,8 +207,6 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
         //Extracts apk from device, saves it by package name to sideloader folder
         public static ProcessOutput getApk(string GameName)
         {
-
-            ADB.WakeDevice();
             _ = new ProcessOutput("", "");
 
             string packageName = Sideloader.gameNameToPackageName(GameName);
@@ -226,62 +245,43 @@ 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.Equals(game[SideloaderRCLONE.GameNameIndex]) || gameName.Equals(game[SideloaderRCLONE.ReleaseNameIndex]))
                     return game[SideloaderRCLONE.PackageNameIndex];
-                }
-
-                if (gameName.Equals(game[SideloaderRCLONE.ReleaseNameIndex]))
-                {
-                    return game[SideloaderRCLONE.PackageNameIndex];
-                }
             }
             return gameName;
         }
 
-        public static string PackageNametoGameName(string gameName)
+        public static string PackageNametoGameName(string packageName)
         {
             foreach (string[] game in SideloaderRCLONE.games)
             {
-                if (gameName.Equals(game[SideloaderRCLONE.PackageNameIndex]))
-                {
+                if (packageName.Equals(game[SideloaderRCLONE.PackageNameIndex]))
                     return game[SideloaderRCLONE.ReleaseNameIndex];
-                }
             }
-            return gameName;
+            return packageName;
         }
 
         public static string gameNameToSimpleName(string gameName)
         {
             foreach (string[] game in SideloaderRCLONE.games)
             {
-                if (gameName.Equals(game[SideloaderRCLONE.GameNameIndex]))
-                {
+                if (gameName.Equals(game[SideloaderRCLONE.GameNameIndex]) || gameName.Equals(game[SideloaderRCLONE.ReleaseNameIndex]))
                     return game[SideloaderRCLONE.GameNameIndex];
-                }
-
-                if (gameName.Equals(game[SideloaderRCLONE.ReleaseNameIndex]))
-                {
-                    return game[SideloaderRCLONE.GameNameIndex];
-                }
             }
             return gameName;
         }
 
-        public static string PackageNameToSimpleName(string gameName)
+        public static string PackageNameToSimpleName(string packageName)
         {
             foreach (string[] game in SideloaderRCLONE.games)
             {
-                if (gameName.Contains(game[SideloaderRCLONE.PackageNameIndex]))
-                {
+                if (packageName.Contains(game[SideloaderRCLONE.PackageNameIndex]))
                     return game[SideloaderRCLONE.GameNameIndex];
-                }
             }
-            return gameName;
+            return packageName;
         }
 
-
-        //Downloads the required files
+        // Download required dependencies.
         public static void downloadFiles()
         {
             WebClient client = new WebClient();
@@ -293,48 +293,48 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                 if (!File.Exists("Sideloader Launcher.exe"))
                 {
                     currentAccessedWebsite = "github";
-                    client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/Sideloader%20Launcher.exe", "Sideloader Launcher.exe");
+                    _ = Logger.Log($"Missing 'Sideloader Launcher.exe'. Attempting to download from {currentAccessedWebsite}");
+                    client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/Sideloader%20Launcher.exe", "Sideloader Launcher.exe");
+                    _ = Logger.Log($"'Sideloader Launcher.exe' download successful");
                 }
 
                 if (!File.Exists("Rookie Offline.cmd"))
                 {
                     currentAccessedWebsite = "github";
-                    client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/Rookie%20Offline.cmd", "Rookie Offline.cmd");
+                    _ = Logger.Log($"Missing 'Rookie Offline.cmd'. Attempting to download from {currentAccessedWebsite}");
+                    client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/Rookie%20Offline.cmd", "Rookie Offline.cmd");
+                    _ = Logger.Log($"'Rookie Offline.cmd' download successful");
                 }
 
-                if (!File.Exists("C:\\RSL\\platform-tools\\aug2021.txt") || !File.Exists("C:\\RSL\\platform-tools\\adb.exe")) //if adb is not updated, download and auto extract
+                if (!File.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools\\adb.exe")) //if adb is not updated, download and auto extract
                 {
-                    if (Directory.Exists($"C:\\RSL\\2.8.2"))
+                    if (!Directory.Exists($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools"))
                     {
-                        Directory.Delete("C:\\RSL\\2.8.2", true);
-                    }
-
-                    if (Directory.Exists($"{Properties.Settings.Default.MainDir}\\adb"))
-                    {
-                        Directory.Delete($"{Properties.Settings.Default.MainDir}\\adb", true);
-                    }
-
-                    if (!Directory.Exists("C:\\RSL\\platform-tools"))
-                    {
-                        _ = Directory.CreateDirectory("C:\\RSL\\platform-tools");
+                        _ = Directory.CreateDirectory($"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools");
                     }
 
                     currentAccessedWebsite = "github";
-                    client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/adb2.zip", "Ad.7z");
-                    Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\Ad.7z", "C:\\RSL\\platform-tools");
-                    File.Delete("Ad.7z");
+                    _ = Logger.Log($"Missing adb within {Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools. Attempting to download from {currentAccessedWebsite}");
+                    client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/adb2.zip", "_adb.7z");
+                    Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\_adb.7z", $"{Path.GetPathRoot(Environment.SystemDirectory)}RSL\\platform-tools");
+                    File.Delete("_adb.7z");
+                    _ = Logger.Log($"adb download successful");
                 }
 
                 if (!Directory.Exists(Environment.CurrentDirectory + "\\rclone"))
                 {
                     currentAccessedWebsite = "rclone";
+                    _ = Logger.Log($"Missing rclone. Attempting to download from {currentAccessedWebsite}.org");
                     string url = Environment.Is64BitOperatingSystem
                         ? "https://downloads.rclone.org/v1.62.2/rclone-v1.62.2-windows-amd64.zip"
                         : "https://downloads.rclone.org/v1.62.2/rclone-v1.62.2-windows-386.zip";
                     //Since sideloader is build for x86, it should work on both x86 and x64 so we download the according rclone version
 
+                    _ = Logger.Log("Begin download rclone");
                     client.DownloadFile(url, "rclone.zip");
+                    _ = Logger.Log("Complete download rclone");
 
+                    _ = Logger.Log($"Extract {Environment.CurrentDirectory}\\rclone.zip");
                     Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\rclone.zip", Environment.CurrentDirectory);
 
                     File.Delete("rclone.zip");
@@ -348,33 +348,36 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                             break; //only 1 rclone folder
                         }
                     }
+                    _ = Logger.Log($"rclone download successful");
                 }
                 else
                 {
+                    _ = Logger.Log($"Checking for Local rclone...");
                     string pathToRclone = Path.Combine(Environment.CurrentDirectory, "rclone", "rclone.exe");
                     if (File.Exists(pathToRclone))
                     {
                         var versionInfo = FileVersionInfo.GetVersionInfo(pathToRclone);
                         string version = versionInfo.ProductVersion;
                         Logger.Log($"Current RCLONE Version {version}");
-                        if (version != "1.62.2")
+                        if (!MainForm.noRcloneUpdating)
                         {
-                            Logger.Log("RCLONE Version not matching! Downloading required version.", "WARNING");
-                            File.Delete(pathToRclone);
-                            currentAccessedWebsite = "rclone";
-                            string architecture = Environment.Is64BitOperatingSystem ? "amd64" : "386";
-                            string url = $"https://downloads.rclone.org/v1.62.2/rclone-v1.62.2-windows-{architecture}.zip";
-                            client.DownloadFile(url, "rclone.zip");
-                            Utilities.Zip.ExtractFile(Path.Combine(Environment.CurrentDirectory, "rclone.zip"), Environment.CurrentDirectory);
-                            File.Delete("rclone.zip");
-                            string rcloneDirectory = Path.Combine(Environment.CurrentDirectory, $"rclone-v1.62.2-windows-{architecture}");
-                            File.Move(Path.Combine(rcloneDirectory, "rclone.exe"), pathToRclone);
-                            Directory.Delete(rcloneDirectory, true);
+                            if (version != "1.62.2")
+                            {
+                                Logger.Log($"RCLONE Version does not match ({version})! Downloading required version (1.62.2)", LogLevel.WARNING);
+                                File.Delete(pathToRclone);
+                                currentAccessedWebsite = "rclone";
+                                string architecture = Environment.Is64BitOperatingSystem ? "amd64" : "386";
+                                string url = $"https://downloads.rclone.org/v1.62.2/rclone-v1.62.2-windows-{architecture}.zip";
+                                client.DownloadFile(url, "rclone.zip");
+                                Utilities.Zip.ExtractFile(Path.Combine(Environment.CurrentDirectory, "rclone.zip"), Environment.CurrentDirectory);
+                                File.Delete("rclone.zip");
+                                string rcloneDirectory = Path.Combine(Environment.CurrentDirectory, $"rclone-v1.62.2-windows-{architecture}");
+                                File.Move(Path.Combine(rcloneDirectory, "rclone.exe"), pathToRclone);
+                                Directory.Delete(rcloneDirectory, true);
+                            }
                         }
                     }
                 }
-
-
             }
             catch (Exception ex)
             {

Sideloader/RCLONE.cs

@@ -179,14 +179,14 @@ namespace AndroidSideloader
             _ = Logger.Log($"Attempting to Update Download Config");
             try
             {
-                string configUrl = "https://wiki.vrpirates.club/downloads/vrp.download.config";
+                string configUrl = "https://vrpirates.wiki/downloads/vrp.download.config";
 
                 HttpWebRequest getUrl = (HttpWebRequest)WebRequest.Create(configUrl);
                 using (StreamReader responseReader = new StreamReader(getUrl.GetResponse().GetResponseStream()))
                 {
                     string resultString = responseReader.ReadToEnd();
 
-                    _ = Logger.Log($"Retrived updated config from: {configUrl}");
+                    _ = Logger.Log($"Retrieved updated config from: {configUrl}");
 
                     if (File.Exists(Environment.CurrentDirectory + "\\rclone\\vrp.download.config_new"))
                     {
@@ -248,7 +248,7 @@ namespace AndroidSideloader
             _ = Logger.Log($"Attempting to Update Upload Config");
             try
             {
-                string configUrl = "https://wiki.vrpirates.club/downloads/vrp.upload.config";
+                string configUrl = "https://vrpirates.wiki/downloads/vrp.upload.config";
 
                 HttpWebRequest getUrl = (HttpWebRequest)WebRequest.Create(configUrl);
                 using (StreamReader responseReader = new StreamReader(getUrl.GetResponse().GetResponseStream()))
@@ -264,7 +264,7 @@ namespace AndroidSideloader
             }
             catch (Exception e)
             {
-                _ = Logger.Log($"Failed to update Upload config: {e.Message}", "ERROR");
+                _ = Logger.Log($"Failed to update Upload config: {e.Message}", LogLevel.ERROR);
             }
         }
 
@@ -277,7 +277,7 @@ namespace AndroidSideloader
             _ = Logger.Log($"Attempting to Update Public Config");
             try
             {
-                string configUrl = "https://wiki.vrpirates.club/downloads/vrp-public.json";
+                string configUrl = "https://vrpirates.wiki/downloads/vrp-public.json";
 
                 HttpWebRequest getUrl = (HttpWebRequest)WebRequest.Create(configUrl);
                 using (StreamReader responseReader = new StreamReader(getUrl.GetResponse().GetResponseStream()))
@@ -293,7 +293,7 @@ namespace AndroidSideloader
             }
             catch (Exception e)
             {
-                _ = Logger.Log($"Failed to update Public config: {e.Message}", "ERROR");
+                _ = Logger.Log($"Failed to update Public config: {e.Message}", LogLevel.ERROR);
             }
         }
 

Splash.Designer.cs

@@ -42,6 +42,7 @@
             this.ControlBox = false;
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "Splash";
             this.ShowIcon = false;

SpoofForm.Designer.cs

@@ -1,127 +0,0 @@
-namespace AndroidSideloader
-{
-    partial class SpoofForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.PackageNameTextBox = new System.Windows.Forms.TextBox();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.SpoofButton = new AndroidSideloader.RoundButton();
-            this.RandomizeButton = new AndroidSideloader.RoundButton();
-            this.SuspendLayout();
-            // 
-            // PackageNameTextBox
-            // 
-            this.PackageNameTextBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.TextBoxColor;
-            this.PackageNameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.PackageNameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.PackageNameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.PackageNameTextBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.PackageNameTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.PackageNameTextBox.Location = new System.Drawing.Point(13, 13);
-            this.PackageNameTextBox.Name = "PackageNameTextBox";
-            this.PackageNameTextBox.Size = new System.Drawing.Size(273, 24);
-            this.PackageNameTextBox.TabIndex = 1;
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Location = new System.Drawing.Point(13, 43);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(273, 23);
-            this.progressBar1.TabIndex = 3;
-            // 
-            // SpoofButton
-            // 
-            this.SpoofButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
-            this.SpoofButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
-            this.SpoofButton.BackColor = System.Drawing.Color.Transparent;
-            this.SpoofButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.SpoofButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.SpoofButton.ForeColor = System.Drawing.Color.White;
-            this.SpoofButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.SpoofButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.SpoofButton.Location = new System.Drawing.Point(176, 72);
-            this.SpoofButton.Name = "SpoofButton";
-            this.SpoofButton.Radius = 5;
-            this.SpoofButton.Size = new System.Drawing.Size(110, 42);
-            this.SpoofButton.Stroke = true;
-            this.SpoofButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.SpoofButton.TabIndex = 5;
-            this.SpoofButton.Text = "Spoof!";
-            this.SpoofButton.Transparency = false;
-            this.SpoofButton.Click += new System.EventHandler(this.SpoofButton_Click);
-            // 
-            // RandomizeButton
-            // 
-            this.RandomizeButton.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
-            this.RandomizeButton.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
-            this.RandomizeButton.BackColor = System.Drawing.Color.Transparent;
-            this.RandomizeButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.RandomizeButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.RandomizeButton.ForeColor = System.Drawing.Color.White;
-            this.RandomizeButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.RandomizeButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.RandomizeButton.Location = new System.Drawing.Point(12, 72);
-            this.RandomizeButton.Name = "RandomizeButton";
-            this.RandomizeButton.Radius = 5;
-            this.RandomizeButton.Size = new System.Drawing.Size(110, 42);
-            this.RandomizeButton.Stroke = true;
-            this.RandomizeButton.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.RandomizeButton.TabIndex = 6;
-            this.RandomizeButton.Text = "Randomize";
-            this.RandomizeButton.Transparency = false;
-            this.RandomizeButton.Click += new System.EventHandler(this.RandomizeButton_Click);
-            // 
-            // SpoofForm
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
-            this.BackgroundImage = global::AndroidSideloader.Properties.Resources.pattern_cubes_1_1_1_0_0_0_1__000000_212121;
-            this.ClientSize = new System.Drawing.Size(300, 131);
-            this.Controls.Add(this.RandomizeButton);
-            this.Controls.Add(this.SpoofButton);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.PackageNameTextBox);
-            this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.MaximumSize = new System.Drawing.Size(316, 170);
-            this.MinimumSize = new System.Drawing.Size(316, 170);
-            this.Name = "SpoofForm";
-            this.Text = "SpoofForm";
-            this.Load += new System.EventHandler(this.SpoofForm_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.TextBox PackageNameTextBox;
-        private System.Windows.Forms.ProgressBar progressBar1;
-        private RoundButton SpoofButton;
-        private RoundButton RandomizeButton;
-    }
-}

SpoofForm.cs

@@ -1,79 +0,0 @@
-using JR.Utils.GUI.Forms;
-using Spoofer;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace AndroidSideloader
-{
-    public partial class SpoofForm : Form
-    {
-        public SpoofForm()
-        {
-            InitializeComponent();
-        }
-
-        private async void SpoofButton_Click(object sender, EventArgs e)
-        {
-            if (!spoofer.HasDependencies())
-            {
-                _ = MessageBox.Show("You are missing the dependencies... Cannot spoof games");
-                return;
-            }
-            string NewPackageName = PackageNameTextBox.Text;
-            string path;
-
-            using (OpenFileDialog openFileDialog = new OpenFileDialog())
-            {
-                openFileDialog.Filter = "Android apps (*.apk)|*.apk";
-                openFileDialog.FilterIndex = 2;
-                openFileDialog.RestoreDirectory = true;
-
-                if (openFileDialog.ShowDialog() == DialogResult.OK)
-                {
-                    path = openFileDialog.FileName;
-                }
-                else
-                {
-                    return;
-                }
-            }
-
-            progressBar1.Style = ProgressBarStyle.Marquee;
-
-            string output = "";
-            //Spawn spoofer in a new thread so the ui isn't blocked
-            Thread t1 = new Thread(() =>
-            {
-                spoofer.Init();
-                output += spoofer.SpoofApk(path, NewPackageName);
-            })
-            {
-                IsBackground = true
-            };
-            t1.Start();
-
-            while (t1.IsAlive)
-            {
-                await Task.Delay(100);
-            }
-
-            progressBar1.Style = ProgressBarStyle.Continuous;
-
-            _ = output.Contains("is not recognized as an internal or external command")
-                ? FlexibleMessageBox.Show(Program.form, Sideloader.SpooferWarning)
-                : FlexibleMessageBox.Show(Program.form, $"App spoofed from {spoofer.originalPackageName} to {NewPackageName}");
-        }
-
-        private void SpoofForm_Load(object sender, EventArgs e)
-        {
-            PackageNameTextBox.Text = Utilities.GeneralUtilities.RandomPackageName();
-        }
-
-        private void RandomizeButton_Click(object sender, EventArgs e)
-        {
-            PackageNameTextBox.Text = Utilities.GeneralUtilities.RandomPackageName();
-        }
-    }
-}

SpoofForm.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

UpdateForm.Designer.cs

@@ -29,13 +29,14 @@ namespace AndroidSideloader
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UpdateForm));
             this.panel1 = new System.Windows.Forms.Panel();
+            this.YesUpdate = new AndroidSideloader.RoundButton();
             this.panel3 = new System.Windows.Forms.Panel();
             this.UpdateTextBox = new System.Windows.Forms.RichTextBox();
             this.UpdateVerLabel = new System.Windows.Forms.Label();
             this.CurVerLabel = new System.Windows.Forms.Label();
             this.SkipUpdate = new System.Windows.Forms.Label();
-            this.YesUpdate = new AndroidSideloader.RoundButton();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             this.SuspendLayout();
@@ -58,6 +59,27 @@ namespace AndroidSideloader
             this.panel1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.UpdateForm_MouseMove);
             this.panel1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.UpdateForm_MouseUp);
             // 
+            // YesUpdate
+            // 
+            this.YesUpdate.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.YesUpdate.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
+            this.YesUpdate.BackColor = System.Drawing.Color.Transparent;
+            this.YesUpdate.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.YesUpdate.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
+            this.YesUpdate.ForeColor = System.Drawing.Color.White;
+            this.YesUpdate.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.YesUpdate.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
+            this.YesUpdate.Location = new System.Drawing.Point(339, 245);
+            this.YesUpdate.Name = "YesUpdate";
+            this.YesUpdate.Radius = 5;
+            this.YesUpdate.Size = new System.Drawing.Size(111, 31);
+            this.YesUpdate.Stroke = true;
+            this.YesUpdate.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
+            this.YesUpdate.TabIndex = 2;
+            this.YesUpdate.Text = "Update Now";
+            this.YesUpdate.Transparency = false;
+            this.YesUpdate.Click += new System.EventHandler(this.YesUpdate_Click);
+            // 
             // panel3
             // 
             this.panel3.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
@@ -126,27 +148,6 @@ namespace AndroidSideloader
             this.SkipUpdate.Text = "𝖲𝖪𝖨𝖯 𝖥𝖮𝖱 𝖭𝖮𝖶";
             this.SkipUpdate.Click += new System.EventHandler(this.SkipUpdate_Click);
             // 
-            // YesUpdate
-            // 
-            this.YesUpdate.Active1 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
-            this.YesUpdate.Active2 = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40)))));
-            this.YesUpdate.BackColor = System.Drawing.Color.Transparent;
-            this.YesUpdate.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.YesUpdate.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
-            this.YesUpdate.ForeColor = System.Drawing.Color.White;
-            this.YesUpdate.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.YesUpdate.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25)))));
-            this.YesUpdate.Location = new System.Drawing.Point(339, 245);
-            this.YesUpdate.Name = "YesUpdate";
-            this.YesUpdate.Radius = 5;
-            this.YesUpdate.Size = new System.Drawing.Size(111, 31);
-            this.YesUpdate.Stroke = true;
-            this.YesUpdate.StrokeColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(74)))), ((int)(((byte)(74)))));
-            this.YesUpdate.TabIndex = 2;
-            this.YesUpdate.Text = "Update Now";
-            this.YesUpdate.Transparency = false;
-            this.YesUpdate.Click += new System.EventHandler(this.YesUpdate_Click);
-            // 
             // UpdateForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -157,6 +158,7 @@ namespace AndroidSideloader
             this.ControlBox = false;
             this.Controls.Add(this.panel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "UpdateForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.UpdateForm_MouseDown);

Updater.cs

@@ -1,67 +1,79 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace AndroidSideloader
 {
     internal class Updater
     {
         public static string AppName { get; set; }
-        public static string Repostory { get; set; }
-        private static string RawGitHubUrl;
-        private static string GitHubUrl;
+        public static string Repository { get; set; }
+        private static readonly string RawGitHubUrl = "https://raw.githubusercontent.com/VRPirates/rookie";
+        private static readonly string GitHubUrl = "https://github.com/VRPirates/rookie";
 
-        public static readonly string LocalVersion = "2.20";
+        public static readonly string LocalVersion = "2.26";
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 
-        //Check if there is a new version of the sideloader
-        private static bool IsUpdateAvailable()
+        // Check if there is a new version of the sideloader
+        private static async Task<bool> IsUpdateAvailableAsync()
         {
-            HttpClient client = new HttpClient();
-            try
+            using (HttpClient client = new HttpClient())
             {
-                currentVersion = client.GetStringAsync($"{RawGitHubUrl}/master/version").Result;
-                changelog = client.GetStringAsync($"{RawGitHubUrl}/master/changelog.txt").Result;
-                client.Dispose();
-                currentVersion = currentVersion.Trim();
+                try
+                {
+                    currentVersion = await client.GetStringAsync($"{RawGitHubUrl}/master/version");
+                    changelog = await client.GetStringAsync($"{RawGitHubUrl}/master/changelog.txt");
+                    currentVersion = currentVersion.Trim();
+                }
+                catch (HttpRequestException)
+                {
+                    return false;
+                }
             }
-            catch { return false; }
+
             return LocalVersion.Trim() != currentVersion;
         }
 
-        //Call this to ask the user if they want to update
-        public static void Update()
+        // Call this to ask the user if they want to update
+        public static async Task Update()
         {
-            RawGitHubUrl = $"https://raw.githubusercontent.com/nerdunit/androidsideloader";
-            GitHubUrl = $"https://github.com/nerdunit/androidsideloader";
-            if (IsUpdateAvailable())
+            if (await IsUpdateAvailableAsync())
             {
                 UpdateForm upForm = new UpdateForm();
-                _ = upForm.ShowDialog(); ;
+                _ = upForm.ShowDialog();
             }
-
-
         }
 
-        //If the user wants to update
+        // If the user wants to update
         public static void doUpdate()
         {
             try
             {
-                _ = ADB.RunAdbCommandToString("kill-server");
-                WebClient fileClient = new WebClient();
-                ServicePointManager.Expect100Continue = true;
-                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-                _ = Logger.Log($"Downloading update from {GitHubUrl}/releases/download/v{currentVersion}/{AppName}.exe to {AppName} v{currentVersion}.exe");
-                fileClient.DownloadFile($"{GitHubUrl}/releases/download/v{currentVersion}/{AppName}.exe", $"{AppName} v{currentVersion}.exe");
-                fileClient.Dispose();
-                _ = Logger.Log($"Starting {AppName} v{currentVersion}.exe");
-                _ = Process.Start($"{AppName} v{currentVersion}.exe");
-                //Delete current version
+                ADB.RunAdbCommandToString("kill-server");
+
+                using (WebClient fileClient = new WebClient())
+                {
+                    ServicePointManager.Expect100Continue = true;
+                    ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+                        
+                    Logger.Log($"Downloading update from {GitHubUrl}/releases/download/v{currentVersion}/{AppName}.exe to {AppName} v{currentVersion}.exe");
+                    fileClient.DownloadFile($"{GitHubUrl}/releases/download/v{currentVersion}/{AppName}.exe", $"{AppName} v{currentVersion}.exe");
+
+                    Logger.Log($"Starting {AppName} v{currentVersion}.exe");
+                    Process.Start($"{AppName} v{currentVersion}.exe");
+                }
+
+                // Delete current version
                 AndroidSideloader.Utilities.GeneralUtilities.Melt();
             }
-            catch { }
+            catch (Exception ex)
+            {
+                // Handle specific exceptions that might occur during the update process
+                Logger.Log($"Update failed: {ex.Message}");
+            }
         }
     }
-}
+}

UsernameForm.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UsernameForm));
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.button1 = new AndroidSideloader.RoundButton();
             this.SuspendLayout();
@@ -77,6 +78,7 @@
             this.Controls.Add(this.textBox1);
             this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.ForeColor = System.Drawing.Color.White;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximumSize = new System.Drawing.Size(459, 139);
             this.MinimumSize = new System.Drawing.Size(459, 139);
             this.Name = "UsernameForm";

Utilities/GeneralUtilities.cs

@@ -93,7 +93,7 @@ namespace AndroidSideloader.Utilities
             string error = cmd.StandardError.ReadToEnd();
             string output = cmd.StandardOutput.ReadToEnd();
             _ = Logger.Log($"Output: {output}");
-            _ = Logger.Log($"Error: {error}", "ERROR");
+            _ = Logger.Log($"Error: {error}", LogLevel.ERROR);
             return new ProcessOutput(output, error);
         }
 

Utilities/Logger.cs

@@ -1,23 +1,39 @@
 using System;
 using System.IO;
+using System.Text;
 
 namespace AndroidSideloader
 {
-    internal class Logger
+    public enum LogLevel
     {
-        public string logfile = Properties.Settings.Default.CurrentLogPath;
-        public static bool Log(string text, string logLevel = "NOTICE", bool ret = true)
+        DEBUG,
+        INFO,
+        WARNING,
+        ERROR,
+        TRACE,
+        FATAL
+    }
+
+    public static class Logger
+    {
+        private static readonly object lockObject = new object();
+        private static string logFilePath = Properties.Settings.Default.CurrentLogPath;
+        
+        public static bool Log(string text, LogLevel logLevel = LogLevel.INFO, bool ret = true)
         {
-            if (text.Length <= 5)
+            if (string.IsNullOrWhiteSpace(text) || text.Length <= 5)
                 return ret;
 
-            string time = DateTime.UtcNow.ToString("hh:mmtt(UTC): ");
+            string time = DateTime.UtcNow.ToString("hh:mm:ss.fff tt (UTC): ");
             string newline = text.Length > 40 && text.Contains("\n") ? "\n\n" : "\n";
-            string logEntry = time + "[" + logLevel.ToUpper() + "] " + text + newline;
+            string logEntry = time + "[" + logLevel.ToString().ToUpper() + "] [" + GetCallerInfo() + "] " + text + newline;
 
             try
             {
-                File.AppendAllText(Properties.Settings.Default.CurrentLogPath, logEntry);
+                lock (lockObject)
+                {
+                    File.AppendAllText(logFilePath, logEntry);
+                }
             }
             catch
             {
@@ -26,5 +42,21 @@ namespace AndroidSideloader
 
             return ret;
         }
+        
+        private static string GetCallerInfo()
+        {
+            System.Diagnostics.StackTrace stackTrace = new System.Diagnostics.StackTrace(true);
+            if (stackTrace.FrameCount >= 3)
+            {
+                var frame = stackTrace.GetFrame(2);
+                var method = frame.GetMethod();
+                string className = method.DeclaringType?.Name;
+                string methodName = method.Name;
+                string callerInfo = $"{className}.{methodName}";
+                return callerInfo;
+            }
+
+            return string.Empty;
+        }
     }
 }

Utilities/Zip.cs

@@ -4,6 +4,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
 using System.Windows.Forms;
 
 namespace AndroidSideloader.Utilities
@@ -12,13 +15,13 @@ namespace AndroidSideloader.Utilities
     {
         public static void ExtractFile(string sourceArchive, string destination)
         {
-            string args = $"x \"{sourceArchive}\" -y -o\"{destination}\"";
+            string args = $"x \"{sourceArchive}\" -y -o\"{destination}\" -bsp1";
             DoExtract(args);
         }
 
         public static void ExtractFile(string sourceArchive, string destination, string password)
         {
-            string args = $"x \"{sourceArchive}\" -y -o\"{destination}\" -p\"{password}\"";
+            string args = $"x \"{sourceArchive}\" -y -o\"{destination}\" -p\"{password}\" -bsp1";
             DoExtract(args);
         }
 
@@ -28,10 +31,11 @@ namespace AndroidSideloader.Utilities
             {
                 _ = Logger.Log("Begin download 7-zip");
                 WebClient client = new WebClient();
-                client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/7z.exe", "7z.exe");
-                client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/7z.dll", "7z.dll");
+                client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/7z.exe", "7z.exe");
+                client.DownloadFile("https://github.com/VRPirates/rookie/raw/master/7z.dll", "7z.dll");
                 _ = Logger.Log("Complete download 7-zip");
             }
+
             ProcessStartInfo pro = new ProcessStartInfo
             {
                 WindowStyle = ProcessWindowStyle.Hidden,
@@ -46,25 +50,52 @@ namespace AndroidSideloader.Utilities
 
             _ = Logger.Log($"Extract: 7z {string.Join(" ", args.Split(' ').Where(a => !a.StartsWith("-p")))}");
 
-            Process x = Process.Start(pro);
-            x.WaitForExit();
-            if (x.ExitCode != 0)
+            using (Process x = new Process())
             {
-                string error = x.StandardError.ReadToEnd();
+                x.StartInfo = pro;
 
-                if (error.Contains("There is not enough space on the disk"))
+                if (MainForm.isInDownloadExtract && x != null)
                 {
-                    _ = FlexibleMessageBox.Show(Program.form, $"Not enough space to extract archive.\r\nCheck free space in {Environment.CurrentDirectory} and try again.",
-                        "NOT ENOUGH SPACE",
-                        MessageBoxButtons.OK,
-                        MessageBoxIcon.Error);
+                    x.OutputDataReceived += (sender, e) =>
+                    {
+                        if (e.Data != null)
+                        {
+                            var match = Regex.Match(e.Data, @"(\d+)%");
+                            if (match.Success)
+                            {
+                                int progress = int.Parse(match.Groups[1].Value);
+                                MainForm mainForm = (MainForm)Application.OpenForms[0];
+                                if (mainForm != null)
+                                {
+                                    mainForm.Invoke((Action)(() => mainForm.SetProgress(progress)));
+                                }
+                            }
+                        }
+                    };
+                }
+                x.ErrorDataReceived += (sender, e) => Console.WriteLine(e.Data);
+
+                x.Start();
+
+                x.BeginOutputReadLine();
+                x.BeginErrorReadLine();
+                x.WaitForExit();
+                if (x.ExitCode != 0)
+                {
+                    string error = x.StandardError.ReadToEnd();
+
+                    if (error.Contains("There is not enough space on the disk"))
+                    {
+                        _ = FlexibleMessageBox.Show(Program.form, $"Not enough space to extract archive.\r\nMake sure your {Path.GetPathRoot(Properties.Settings.Default.downloadDir)} drive has at least double the space of the game, then try again.",
+                            "NOT ENOUGH SPACE",
+                            MessageBoxButtons.OK,
+                            MessageBoxIcon.Error);
+                    }
+                    _ = Logger.Log(x.StandardOutput.ReadToEnd());
+                    _ = Logger.Log(error, LogLevel.ERROR);
+                    throw new ApplicationException($"Extracting failed, status code {x.ExitCode}");
                 }
-                _ = Logger.Log(x.StandardOutput.ReadToEnd());
-                _ = Logger.Log(error, "ERROR");
-                throw new ApplicationException($"Extracting failed, status code {x.ExitCode}");
             }
         }
     }
-
-
-}
+}

changelog.txt

@@ -1,21 +1,14 @@
-RSL 2.20
+RSL 2.26
 
-- Feature: Added manual IP on Wireless ADB
-- Feature: Rookie will now delete old OBB Folders before pushing new obb folders
-- Feature: Add Single-Thread mode in settings (For users with download issues using multiple threads)
-- Fix: Device Storage display
-- Fix: Games that come with install.txt will now check for a device to avoid freezes
-- Fix: "No Device Mode" checkbox can't have "Delete after Download and Install" enabled at the same time anymore
-- Fix: Removing Queue Items should no longer ever crash Rookie
-- Fix: Rookie will no longer reload the gamelist if you have filtered it
-- Fix: Check if the rclone we are killing is ours
-- Fix: Put zip extraction into a thread to avoid freezing the UI
-- Fix: Filters should no longer cause crashes.
-- Chore: Update RCLONE to 1.62.2
-- Chore: Cleaning up the code for the Trailers, progress bar, dropdown categories, redundant internet checks, and other code cleanup
-- Chore: Other UI and message box display cleanup
-- Chore: Optimize the code for getting the thumbnail paths
-- Chore: Log Levels added to Debuglog
-
-- Thank you to Chax for the new features and fixes!
-~ fenopy
+- Feature: Top right update labels will now show the amount of games per state
+- Feature: Open Download Dir and Run ADB Commands added to left sidebar
+- Feature: Toggle sideloading button
+- Feature: Show progress of extraction
+- Fix: Crash when failing to write to the StoredIP.txt
+- Fix: Drag and drop + Copy OBB for Quest 3 users
+- Fix: Properly kill off WebView2 instances
+- Fix: Added parents to dialogs
+- Fix: GUI freezing on launch
+- Fix: No Device Mode output
+- Chore: Make missing space message more user-friendly
+- Chore: Remove QU Settings

spoofer.cs

@@ -1,247 +0,0 @@
-using AndroidSideloader;
-using AndroidSideloader.Utilities;
-using System;
-using System.Diagnostics;
-using System.IO;
-
-namespace Spoofer
-{
-    internal class spoofer
-    {
-        public static string alias = string.Empty;
-        public static string password = string.Empty;
-
-        public static void Init()
-        {
-            //If there is no keystore or details (user and pw for keystore) generate them!
-            if ((File.Exists("keystore.key") == false || File.Exists("details.txt") == false) && HasDependencies())
-            {
-                Random rand = new Random();
-                alias = GeneralUtilities.randomString(8);
-                password = GeneralUtilities.randomString(16);
-                string subject = $"CN = {GeneralUtilities.randomString(rand.Next(2, 6))}, OU = {GeneralUtilities.randomString(rand.Next(2, 6))}, O = {GeneralUtilities.randomString(rand.Next(2, 6))}, L = {GeneralUtilities.randomString(rand.Next(2, 6))}, ST = {GeneralUtilities.randomString(rand.Next(2, 6))}, C = {GeneralUtilities.randomString(rand.Next(2, 6))}";
-                Process cmd = new Process();
-                cmd.StartInfo.FileName = "cmd.exe";
-                cmd.StartInfo.RedirectStandardInput = true;
-                cmd.StartInfo.RedirectStandardOutput = true;
-                cmd.StartInfo.RedirectStandardError = true;
-                cmd.StartInfo.WorkingDirectory = Environment.CurrentDirectory;
-                cmd.StartInfo.CreateNoWindow = true;
-                cmd.StartInfo.UseShellExecute = false;
-                _ = cmd.Start();
-                cmd.StandardInput.WriteLine($"keytool -genkeypair -alias {alias} -keyalg RSA -keysize 2048 -keystore keystore.key -keypass {password} -storepass {password} -dname \"{subject}\"");
-                cmd.StandardInput.Flush();
-                cmd.StandardInput.Close();
-                cmd.WaitForExit();
-                string keyerror = cmd.StandardError.ReadToEnd();
-                string keyoutput = cmd.StandardOutput.ReadToEnd();
-                _ = Logger.Log($"Output: {keyoutput} Error: {keyerror}");
-                File.WriteAllText("details.txt", $"{alias};{password}");
-            }
-            else
-            {
-                string[] temp = File.ReadAllText("details.txt").Split(';');
-                alias = temp[0];
-                password = temp[1];
-            }
-        }
-
-        public static string folderPath = string.Empty;
-
-        public static string decompiledPath = string.Empty;
-        public static string newPackageName = string.Empty;
-        public static string originalPackageName = string.Empty;
-
-        public static string spoofedApkPath = string.Empty;
-
-        //public static ProcessOutput ResignAPK(string apkPath)
-        //{
-        //    string output = "";
-        //    string oldGameName = Path.GetFileName(apkPath);
-        //    folderPath = apkPath.Replace(Path.GetFileName(apkPath), "");
-        //    File.Move(apkPath, $"{folderPath}temp.apk");
-        //    apkPath = $"{folderPath}temp.apk";
-        //    decompiledPath = apkPath.Replace(".apk", "");
-        //    string packagename = PackageName(apkPath);
-        //}
-
-        public static ProcessOutput SpoofApk(string apkPath, string newPackageName, string obbPath = "", string spoofedFileName = "spoofed.apk")
-        {
-            //Rename
-            ProcessOutput output = new ProcessOutput("", "");
-            _ = Path.GetFileName(apkPath);
-            folderPath = apkPath.Replace(Path.GetFileName(apkPath), "");
-            File.Move(apkPath, $"{folderPath}temp.apk");
-            apkPath = $"{folderPath}temp.apk";
-            decompiledPath = apkPath.Replace(".apk", "");
-            //newPackageName = $"com.{Utilities.randomString(rand.Next(3, 8))}.{Utilities.randomString(rand.Next(3, 8))}";
-            originalPackageName = PackageName(apkPath);
-            _ = Logger.Log($"Your app will be spoofed as {newPackageName}");
-            _ = Logger.Log($"Folderpath: {folderPath} decompiledPaht: {decompiledPath} ");
-            if (obbPath.Length > 1)
-            {
-                RenameObb(obbPath, newPackageName, originalPackageName);
-            }
-
-            output += DecompileApk(apkPath);
-
-            //Rename APK Packagename
-            string foo = File.ReadAllText($"{decompiledPath}\\AndroidManifest.xml").Replace(originalPackageName, newPackageName);
-            File.WriteAllText($"{decompiledPath}\\AndroidManifest.xml", foo);
-            foreach (string file in Directory.EnumerateFiles(decompiledPath, "*.*", SearchOption.AllDirectories))
-            {
-                if (Path.GetFileName(file) == "BuildConfig.smali")
-                {
-                    foo = File.ReadAllText(file).Replace(originalPackageName, newPackageName);
-                    File.WriteAllText(file, foo);
-                }
-            }
-
-            //spoofedApkPath = $"{Path.GetFileName(apkPath).Replace(".apk", "")}_Spoofed as {newPackageName}.apk";
-            spoofedApkPath = Path.GetDirectoryName(apkPath) + "\\" + spoofedFileName;
-            string apkDecompiledPath = Path.GetFileName(apkPath).Replace(".apk", "");
-
-            output += GeneralUtilities.startProcess("cmd.exe", folderPath, $"apktool b \"{apkDecompiledPath}\" -o \"{spoofedApkPath}\"");
-
-            //Sign the new apk
-            if (File.Exists(folderPath + "keystore.key") == false)
-            {
-                File.Copy("keystore.key", $"{folderPath}keystore.key");
-            }
-
-            output += SignApk(spoofedApkPath);
-
-            //Delete the copy of the key and the decompiled apk folder
-            if (string.Equals(folderPath, Environment.CurrentDirectory + "\\") == false)
-            {
-                File.Delete($"{folderPath}keystore.key");
-            }
-
-            Directory.Delete(decompiledPath, true);
-            File.Delete(apkPath);
-
-            return output;
-        }
-
-        public static ProcessOutput SignApk(string path)
-        {
-            //Logger.Log($"jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore keystore.key \"{path}\" {alias}");
-            Process cmdSign = new Process();
-            cmdSign.StartInfo.FileName = "cmd.exe";
-            cmdSign.StartInfo.RedirectStandardInput = true;
-            cmdSign.StartInfo.WorkingDirectory = folderPath;
-            cmdSign.StartInfo.CreateNoWindow = true;
-            cmdSign.StartInfo.UseShellExecute = false;
-            cmdSign.StartInfo.RedirectStandardOutput = true; //
-            cmdSign.StartInfo.RedirectStandardError = true; //
-            _ = cmdSign.Start();
-            cmdSign.StandardInput.WriteLine($"jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore keystore.key \"{path}\" {alias}");
-            cmdSign.StandardInput.WriteLine(password);
-            cmdSign.StandardInput.Flush();
-            cmdSign.StandardInput.Close();
-            cmdSign.StandardOutput.Close();
-            cmdSign.WaitForExit();
-            //For some reason it hangs when also reading output...
-            //string output = cmdSign.StandardOutput.ReadToEnd();
-            //string error = cmdSign.StandardError.ReadToEnd();
-            //Logger.Log("Jarsign Output " + output);
-            //Logger.Log("Error: " + error);
-            //return new ProcessOutput(output, error);
-            return new ProcessOutput("", "");
-        }
-
-        public static ProcessOutput DecompileApk(string path)
-        {
-            ProcessOutput output = GeneralUtilities.startProcess("cmd.exe", folderPath, $"apktool d -f \"{path}\"");
-            return output;
-        }
-
-        public static bool HasDependencies()
-        {
-            return ExistsOnPath("jarsigner") && ExistsOnPath("apktool") && ExistsOnPath("aapt");
-        }
-
-        public static bool ExistsOnPath(string exeName)
-        {
-            try
-            {
-                using (Process p = new Process())
-                {
-                    p.StartInfo.UseShellExecute = false;
-                    p.StartInfo.FileName = "where";
-                    p.StartInfo.CreateNoWindow = true;
-                    p.StartInfo.Arguments = exeName;
-                    _ = p.Start();
-                    p.WaitForExit();
-                    return p.ExitCode == 0;
-                }
-            }
-            catch
-            {
-                throw new Exception("'where' command is not on path");
-            }
-        }
-
-        public static string GetFullPath(string exeName)
-        {
-            try
-            {
-                using (Process p = new Process())
-                {
-                    p.StartInfo.UseShellExecute = false;
-                    p.StartInfo.FileName = "where";
-                    p.StartInfo.Arguments = exeName;
-                    p.StartInfo.CreateNoWindow = true;
-                    p.StartInfo.RedirectStandardOutput = true;
-                    _ = p.Start();
-                    string output = p.StandardOutput.ReadToEnd();
-                    p.WaitForExit();
-
-                    if (p.ExitCode != 0)
-                    {
-                        return null;
-                    }
-
-                    // just return first match
-                    return output.Substring(0, output.IndexOf(Environment.NewLine));
-                }
-            }
-            catch
-            {
-                throw new Exception("'where' command is not on path");
-            }
-        }
-
-        //Renames obb to new obb according to packagename
-        public static void RenameObb(string obbPath, string newPackageName, string originalPackageName)
-        {
-            Directory.Move(obbPath, obbPath.Replace(originalPackageName, newPackageName));
-            obbPath = obbPath.Replace(originalPackageName, newPackageName);
-            foreach (string file in Directory.GetFiles(obbPath))
-            {
-                if (Path.GetExtension(file) == ".obb")
-                {
-                    File.Move(file, file.Replace(originalPackageName, newPackageName));
-                }
-            }
-        }
-
-        public static string PackageName(string path)
-        {
-            _ = Logger.Log($"aapt dump badging \"{path}\"");
-
-            string originalPackageName = GeneralUtilities.startProcess("cmd.exe", path.Replace(Path.GetFileName(path), string.Empty), $"aapt dump badging \"{path}\" | findstr -i \"package: name\"").Output;
-            _ = Logger.Log($"originalPackageName: {originalPackageName}");
-            try
-            {
-                originalPackageName = originalPackageName.Substring(originalPackageName.IndexOf("package: name='") + 15);
-                originalPackageName = originalPackageName.Substring(0, originalPackageName.IndexOf("'"));
-            }
-            catch
-            {
-                return "PackageName ERROR";
-            }
-            return originalPackageName;
-        }
-    }
-}

version

@@ -1 +1 @@
-2.20
+2.26