Merge pull request #137 from VRPirates/beta/RSL-2.30

Beta/rsl 2.30

ADB.cs

@@ -201,10 +201,10 @@ 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);
+                DialogResult dialogResult = FlexibleMessageBox.Show(Program.form, "On your headset, click on the Notifications Bell, and then select the USB Detected notification to enable Connections.", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
                 if (dialogResult == DialogResult.Cancel)
                 {
-                    Properties.Settings.Default.adbdebugwarned = true;
+                    // Properties.Settings.Default.adbdebugwarned = true;
                     Properties.Settings.Default.Save();
                 }
             });
@@ -283,7 +283,7 @@ public static ProcessOutput Sideload(string path, string packagename = "")
                     Program.form.changeTitle("Performing reinstall, please wait...");
                     _ = ADB.RunAdbCommandToString("kill-server");
                     _ = ADB.RunAdbCommandToString("devices");
-                    _ = ADB.RunAdbCommandToString($"pull /sdcard/Android/data/{MainForm.CurrPCKG} \"{Environment.CurrentDirectory}\"");
+                    _ = ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{MainForm.CurrPCKG}\" \"{Environment.CurrentDirectory}\"");
                     Program.form.changeTitle("Uninstalling game...");
                     _ = Sideloader.UninstallGame(MainForm.CurrPCKG);
                     Program.form.changeTitle("Reinstalling Game");
@@ -308,7 +308,7 @@ public static ProcessOutput CopyOBB(string path)
             string folder = Path.GetFileName(path);
             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\"")
+                ? 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

@@ -194,6 +194,7 @@
     </Compile>
     <Compile Include="FlexibleMessageBox.cs" />
     <Compile Include="RoundedRectangleF.cs" />
+    <Compile Include="Sideloader\GetDependencies.cs" />
     <Compile Include="Splash.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -253,6 +254,7 @@
     <Compile Include="Utilities\UpdateGameData.cs" />
     <Compile Include="Utilities\UploadGame.cs" />
     <Compile Include="Utilities\Zip.cs" />
+    <Compile Include="Utilities\Metrics.cs" />
     <EmbeddedResource Include="DonorsListView.resx">
       <DependentUpon>DonorsListView.cs</DependentUpon>
     </EmbeddedResource>
@@ -307,6 +309,9 @@
     <None Include="Rookie Offline.cmd">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="CleanupInstall.cmd">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="version" />
   </ItemGroup>
   <ItemGroup>
@@ -316,12 +321,13 @@
     <Content Include="changelog.txt" />
     <Content Include="icon.ico" />
     <Content Include="ChangelogHistory.txt" />
-    <Content Include="Resources\pattern_cubes-1_1_1_0-0_0_1__000000_212121.png" />
-    <Content Include="Resources\pattern_herringbone-2_1_3_0-0_90_1__000000_1c1c1c.png" />
-    <Content Include="Resources\splash.jpg" />
-    <None Include="Resources\battery11.png" />
+    <Content Include="Resources\pattern_cubes.png" />
+    <Content Include="Resources\pattern_herringbone.png" />
+    <Content Include="Resources\splashimage.png" />
+    <Content Include="Resources\splashimage_deps.png" />
+    <Content Include="Resources\splashimage_offline.png" />
+    <Content Include="Resources\splashimage_rclone.png" />
     <None Include="Resources\battery.png" />
-    <None Include="Resources\battery1.png" />
     <None Include="Resources\ajax-loader.gif" />
     <None Include="Resources\SearchGlass.PNG" />
   </ItemGroup>

App.config

@@ -182,6 +182,15 @@
             <setting name="UUID" serializeAs="String">
                 <value />
             </setting>
+            <setting name="createPubMirrorFile" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="useDownloadedFiles" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="bandwidthLimit" serializeAs="String">
+                <value>0</value>
+            </setting>
         </AndroidSideloader.Properties.Settings>
         <AndroidADB.Sideloader.Properties.Settings>
             <setting name="checkForUpdates" serializeAs="String">

ChangelogHistory.txt

@@ -1,4 +1,24 @@
-RSL 2.28
+RSL 2.29
+
+- Feature: Prompt to keep temporary files and allow resuming of downloads
+- Feature: Fixed progress bar jump-back
+- Feature: Added part tracking during download
+- Fix: Change UUID calculation. No longer uses system details (caused virus flags)
+- Fix: Added rclone fallback download
+- Fix: Additional connect/startup troubleshooting steps
+- Chore: Bump rclone to 1.66.0
+
+RSL 2.29.1
+- Fix: Correct initilization sequence to prevent crashes
+- Chore: bump package dependencies
+- Chore: Fix initial GUI name
+
+RSL 2.29.2
+- Fix: Fix for failed uploads using new rclone version
+- Fix: Changes to initilization order to prevent crashes and display splash
+
+
+RSL 2.28
 
 - Feature: Added ADB-Backup Support. Now supports creation and restoration of .AB backups
 - Feature: Added OS-Updates toggle to ADB-Command window (Click to toggle on/off)

CleanupInstall.cmd

@@ -0,0 +1,26 @@
+@echo off
+
+echo Killing AndroidSideloader processes...
+taskkill /F /FI "IMAGENAME eq AndroidSideloader*" /T
+
+echo Killing adb.exe processes...
+taskkill /F /FI "IMAGENAME eq adb.exe" /T
+
+
+set "folderPath=C:\Users\%username%\AppData\Local\Rookie.WTF\"
+echo Deleting contents of %folderPath%...
+for /D %%i in ("%folderPath%\*") do (
+    rd /s /q "%%i"
+)
+del /q "%folderPath%\*.*"
+
+
+set "folderPath=C:\Users\%username%\AppData\Local\Rookie.AndroidSideloader\"
+echo Deleting contents of %folderPath%...
+for /D %%i in ("%folderPath%\*") do (
+    rd /s /q "%%i"
+)
+del /q "%folderPath%\*.*"
+
+echo Cleanup complete.
+pause

ColumnSort.cs

@@ -41,7 +41,7 @@ public int Compare(object x, object y)
         // Cast the objects to be compared to ListViewItem objects
         listviewX = (ListViewItem)x;
         listviewY = (ListViewItem)y;
-        if (SortColumn == 5)
+        if (SortColumn == 5 || SortColumn == 6)
         {
             try
             {