2.1.1HF1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Update RSL2.1HF5

Fixed ADB path for usernames containing spaces. ADB now located at c:\RSL\VersionNumber\ADB

- -HarryEffingPotter-
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDdNvsACgkQx/Rql1Vo
czdIWQ/+OvvchZOuwMZJvd6d/N4WmBUPKm3TzyiF5JM/STLEbLIHB1p6LQg+6J3K
3d9x3mQmu/gMHMumsfmuOuHHI7OOs9CLOVY2UFm7CqTnDf7iCxl8+6/iQw48yfj9
63qwUKZdLueRX9IqtcV2MwZJP7eKdZmtv6ALyRbjWmo2fgbm/Fs1U+TfGnlY7qLg
wIascv5DuKRyHvRzlgdn6OqmewWTxHDOTwCTjodROIK9guCELNYhEWv/TtgMldv9
gz1Lr8KZOcxNltpvstJgdbeFy61LK67su0rKZHsGMu4x0hDe4YOyjyMDtXrVJ0VH
SJBqDgSKD3HE/MNYkCWusqs7np2XKXC8hP6nm2QO9zM44d+UWDfrJbwvvw6QUoez
Iqk/PskC3sF7kWAv4O+LRmLDlrHD2RG5TkkE4ohiIi4D4VaNEx4QyVf6INN+A9xd
IxcvXC9QkFwffUD93cThEdLNRnrnzZSsUFMRh3XrvPbq2wfvWjqZX1EGfD7ug0Mf
r9uPX4RdILvsXeybefiiwLiw3UNMJtUlaKDvqIit5S78BIP6DY+dGnMMRIQJa1vd
XBPnIHyifzvl1nyYd6TWCFRuOzZLYirv4Ug6xS1/KzyURXIz2P0EEhDURJAR/q+M
ZmqSO2eQo64B7Dfa9oRLKkZRfhWFgtYA9QKm9ei7tOPbnJ+2718=
=o5Nr
-----END PGP SIGNATURE-----

.vs/VSWorkspaceState.json

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

ADB.cs

@@ -12,7 +12,7 @@ namespace AndroidSideloader
     class ADB
     {
         static Process adb = new Process();
-        public static string adbFolderPath = Environment.CurrentDirectory + "\\adb";
+        public static string adbFolderPath = "C:\\RSL\\2.14HF5\\ADB";
         public static string adbFilePath = adbFolderPath + "\\adb.exe";
         public static string DeviceID = "";
         public static string package = "";

MainForm.cs

@@ -289,11 +289,33 @@ namespace AndroidSideloader
 
         private async void Form1_Load(object sender, EventArgs e)
         {
-            
+            string adbFile = "C:\\RSL\\2.14HF5\\adb\\adb.exe";
+            string adbDir = "C:\\RSL\\2.14HF5\\adb";
+            string fileName = "";
+            string destFile = "";
             Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
-            Properties.Settings.Default.ADBPath = $"{Properties.Settings.Default.MainDir}\\adb\\adb.exe";
+            Properties.Settings.Default.Save();
+            if (!File.Exists(adbFile))
+            {
+                Directory.CreateDirectory(adbDir);
+                if (System.IO.Directory.Exists($"{Environment.CurrentDirectory}\\adb"))
+                {
+                    string[] ADBfiles = System.IO.Directory.GetFiles($"{Properties.Settings.Default.MainDir}\\adb");
+
+                    // Copy the files and overwrite destination files if they already exist.
+                    foreach (string s in ADBfiles)
+                    {
+                        fileName = System.IO.Path.GetFileName(s);
+                        destFile = System.IO.Path.Combine(adbDir, fileName);
+                        System.IO.File.Copy(s, destFile, true);
+                    }
+                }
+
+            }
+            Properties.Settings.Default.ADBPath = adbFile;
+            Properties.Settings.Default.Save();
+
 
-         
             ADB.RunAdbCommandToString("kill-server");
             if (File.Exists(Sideloader.CrashLogPath))
             {
@@ -1321,6 +1343,7 @@ without him none of this would be possible
         private void Form1_FormClosing(object sender, FormClosingEventArgs e)
         {
             RCLONE.killRclone();
+            ADB.RunAdbCommandToString("kill-server");
         }
 
         private void ADBWirelessDisable_Click(object sender, EventArgs e)

Updater.cs

@@ -17,7 +17,7 @@ namespace AndroidSideloader
         private static string RawGitHubUrl;
         private static string GitHubUrl;
 
-        static readonly public string LocalVersion = "2.1HF2";
+        static readonly public string LocalVersion = "2.1HF5";
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 
@@ -28,9 +28,6 @@ namespace AndroidSideloader
             try
             {
                 currentVersion = client.GetStringAsync($"{RawGitHubUrl}/master/version").Result;
-                if (currentVersion.Length > LocalVersion.Length)
-                    currentVersion = currentVersion.Remove(currentVersion.Length - 1);
-                currentVersion = currentVersion.Replace("\n", "");
                 changelog = client.GetStringAsync($"{RawGitHubUrl}/master/changelog.txt").Result;
                 client.Dispose();
             }
@@ -41,8 +38,8 @@ namespace AndroidSideloader
         //Call this to ask the user if they want to update
         public static void Update()
         {
-            RawGitHubUrl = $"https://raw.githubusercontent.com/{Repostory}";
-            GitHubUrl = $"https://github.com/{Repostory}";
+            RawGitHubUrl = $"https://raw.githubusercontent.com/nerdunit/androidsideloader";
+            GitHubUrl = $"https://github.com/nerdunit/androidsideloader";
             if (IsUpdateAvailable())
                 doUpdate();
         }

changelog.txt

@@ -1,7 +1,57 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-RSL 2.1.1
+Update RSL2.1HF5
+
+Fixed ADB path for usernames containing spaces. ADB now located at c:\RSL\VersionNumber\ADB
+
+- -HarryEffingPotter-
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDdNvsACgkQx/Rql1Vo
+czdIWQ/+OvvchZOuwMZJvd6d/N4WmBUPKm3TzyiF5JM/STLEbLIHB1p6LQg+6J3K
+3d9x3mQmu/gMHMumsfmuOuHHI7OOs9CLOVY2UFm7CqTnDf7iCxl8+6/iQw48yfj9
+63qwUKZdLueRX9IqtcV2MwZJP7eKdZmtv6ALyRbjWmo2fgbm/Fs1U+TfGnlY7qLg
+wIascv5DuKRyHvRzlgdn6OqmewWTxHDOTwCTjodROIK9guCELNYhEWv/TtgMldv9
+gz1Lr8KZOcxNltpvstJgdbeFy61LK67su0rKZHsGMu4x0hDe4YOyjyMDtXrVJ0VH
+SJBqDgSKD3HE/MNYkCWusqs7np2XKXC8hP6nm2QO9zM44d+UWDfrJbwvvw6QUoez
+Iqk/PskC3sF7kWAv4O+LRmLDlrHD2RG5TkkE4ohiIi4D4VaNEx4QyVf6INN+A9xd
+IxcvXC9QkFwffUD93cThEdLNRnrnzZSsUFMRh3XrvPbq2wfvWjqZX1EGfD7ug0Mf
+r9uPX4RdILvsXeybefiiwLiw3UNMJtUlaKDvqIit5S78BIP6DY+dGnMMRIQJa1vd
+XBPnIHyifzvl1nyYd6TWCFRuOzZLYirv4Ug6xS1/KzyURXIz2P0EEhDURJAR/q+M
+ZmqSO2eQo64B7Dfa9oRLKkZRfhWFgtYA9QKm9ei7tOPbnJ+2718=
+=o5Nr
+-----END PGP SIGNATURE-----
+
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.1HF4
+
+= Moved ADB files to AppData\Roaming\RSL to fix compatibility issues across the board.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDa9rQACgkQx/Rql1Vo
+czeiYQ//X6e3DD51Kgta/omu0fVtPM4lxt+P/H5ij1xbNPmoaL7w+QvNeFqVLPs0
+T8btbEkDT7pisOHQtHFKENs4G0Sck0RkI0jVNu1lYIT67tmTYyFGP4jOxopktmNE
+uydmI8g+8UkuTPYIKpkYJUOrWT1u4IV0SoBsdERYU7qRZmvCqWgwqdcs4R6wAdm0
+FNqWRbUo/LhFw1rQicny4vL7w6rf7PvAksWifqbl1KfBFAchf4cZ3+YKeyO4V2Ym
+7LcNgVGaSuPCr5dKmVr31B0kU0XrV8KPpKwgoIOym8eH8PNuaj3elwbndqYZ95fB
+xNFluF9z9qejiIkYM9UDSoeNEfeJaUwIfgb1WI4w+BdlTWaYZfsG+DF+VOBvSU/h
+YP1ucGrqCu2lLxcIS5ffNd7dTjS22D2x2rErqXGl+ETgqgVHK9NU9Bd02VVyP171
+Ryq/JRd9tvFknAG6YViVADJDzKdnuwFYeo/T5wgt8P7GtzVZWmZbur6crXK454IH
+TkyLn9XFbJneGPxjLNm4VwCR0XWFmhAsE+CfRz52hL18RAxyeohWq7RBTt+d49t9
+eOhTTzOHoWgroOVTV793r+FLdc4nYDhLXRm6I65qhvQhEPCqZDIA1xuvzPbSectb
+VNNRuPmhxDgtevFFsU/sX8xOv8pKi6naW8N6jobXPavwegABCEg=
+=61BS
+-----END PGP SIGNATURE-----
+
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+RSL 2.1HF3
 
 = Fixed QUSettings not working issue.(unused fields in QUSettings MUST have 0's in them or it will not work, reset/clear all fields button now reflect this.)
 = Fixed Uninstall auto-save-backup

version

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