-----BEGIN PGP SIGNED MESSAGE-----

Hash: SHA256 RSL 2.7.1 = Fixed apk path for in-place reinstall. Should work correctly now. HFP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmEOGwkACgkQx/Rql1Vo czfPHw//eXtKkM1g/mjz43/BLTjhT1PTrwvolCmds+LzMTHT1EfDyouJBZ2XxnXQ NiZkk9SR3m/VmJSr0FO7p7F9Ab07xEUIv280C7Mbqyr0KEPiQTvrlnL/eX4sx/Px 1pmDCuPUL42u2zo4famGxDvduoVToyPrIzzv3QYt8qJGEAYRG4gtn26SB38+JslU eU6hJkB2E7BNZXRtpiDM7rsejOtzsIROdLeIztSyIyTl/sY4Az9nfgRiJFyHsPsJ ILRRkquCzkXbzzdjS8AqPPIzt+JZdp+ZZS2H3gSeld4We8rkm5CzBef7pzeP6ZKZ WGYnw1Et9dtflSAmfDb6i4Rr5Y3mPLk2OzIeYebZ0fCGmyrpJ7QlRfYqJNJ7JMH9 DOmsSNVUvFRR+b0FnT414uSg4Q79cYXWsJ/Wi28PIOQF0nQwtPIKly2x1kB4NE7P CItXy8VJ//q0/2ijHB3ZQIiMkj78TVePCAC6TQT4RnBgWS0HeItBKZJYCcyvhe72 6H9qzOVsIKHgxnfbRON9tZOWxpxIdnbFsaE5TsiXp+80SsaHhxcxuAyjh0M0CaKu lh3z9FJmZW8CrxIA1G1sQePxqF3iObVhqJPqp8G7N6UC1wBnhJWmnBKTYm1iHs6P pj8ggpyFTT55UxGeRklLUyoSxSnqSE7Oj2zluLvBFHPi1KAMlEg= =HVQ5 -----END PGP SIGNATURE-----
nerdunit · Aug 7, 2021 · 26db46e · 26db46e
1 parent d02505b
commit 26db46e
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 53 deletions.
diff --git a/ADB.cs b/ADB.cs
@@ -67,7 +67,7 @@ public static ProcessOutput RunAdbCommandToString(string command)
             }
             else
                 adb.WaitForExit();
-            if (error.Contains("ADB_VENDOR_KEYS") && Properties.Settings.Default.adbdebugwarned)
+            if (error.Contains("ADB_VENDOR_KEYS") && !Properties.Settings.Default.adbdebugwarned)
             {
                 DialogResult dialogResult = FlexibleMessageBox.Show("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)

diff --git a/ChangelogHistory.txt b/ChangelogHistory.txt
@@ -1,6 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+
+RSL 2.7
+
++ Added BMBF drag and drop option for Quest users
+in SETTINGS menu.If users drag and drop BMBF song 
+zip files onto rookie either one by one, an entire 
+folder, or many zips at once Rookie will automatically
+extract the files to a folder then push the folder
+to your device then delete the extraction folder.
++ Added automatic timeout during APK install that
+will ask user if they'd like Rookie to automatically
+uninstall and reinstall the app. Rookie will check
+for save data and copy it to a folder temporarily
+then put it back after reinstall.
+= Cleaned up startup tasks so booting Rookie should
+be faster.
+= Added automatic deletion of previous crashlog to 
+decrease clutter in Rookie directory.
+= Added automatic installed app refresh after drag
+and drop.
+
+HFP
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmENfVMACgkQx/Rql1Vo
+czcxaw//bTVxR5gt1F4c+gDT80dVfJa1Js3h5vSjGgCHjQdmsU6eaU5BQGoUorkw
+6ewYF48jt84xDNj/VirkeqHV95mvsj9sksi+mxvELnAa0NdRVYj0DCqZWB/mNDfx
+lYZGp2SwiGK3a6KfMpPcbi2IEWqc9ZWpdazIDy6l3oGSBAYaoVqfjl+CJQQpomIJ
+x7f67Ei633dyhu8+0612LVu+tZ4ibN2pAAu1Dd5+uvlODUiYLPadhZkLwk+CYC6p
+ifs/1qB/fsXJS6YJyPCmuZCbYN//jLCD9ECQ5cqZbTTU82Ub2lDE+TcdO/CsxSxU
+pueIxZ+7C5TceiNzsDfKfeCWu65hZlBW1xKReDtLPFzZdZuyXYTI0v00kvapwJIO
+C9Eq2qxZvdnp05tw8nY1V4Ae5Jl6oLN0BwWSZv50NhQ4Dpmbl8pemk1r5iZsRhGA
+MWQCytBCaX/3EpJda8ifGJxj3kOno2ewbwXdZEMN7QqWt1scN9HxNXFWEJwO29HV
+pT6ra3T0OrOBLmCQGt4w71HGFK2t+c7aPq0yI/sayguB9zjR/GpTyekg7nHXZh9g
+c+WD5umN2xA0LuLjvvePKhhKTBT6ebmQJh1CRNIRtA150ULbnTAIpZJTDZyhcLXi
+IUfWyWPA4G3GsRUqGWf97O2G2bIbbIzLeg3uEdxF7T9LOigYgpU=
+=Rwj0
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 RSL 2.6
 
 + Added No Device mode for those who wish to download games 

diff --git a/MainForm.cs b/MainForm.cs
@@ -1725,7 +1725,7 @@ private async void downloadInstallGameButton_Click(object sender, EventArgs e)
             }
         }
 
-        private async void timer_Tick4(object sender, EventArgs e)
+        private void timer_Tick4(object sender, EventArgs e)
         {
             ProcessOutput output = new ProcessOutput("", "");
             if (!timerticked)
@@ -1746,27 +1746,21 @@ private async void timer_Tick4(object sender, EventArgs e)
                     DialogResult dialogResult = FlexibleMessageBox.Show("In place upgrade has failed.\n\nThis means the app must be uninstalled first before updating.\nRookie can attempt to do this while retaining your savedata.\nWhile the vast majority of games can be backed up there are some exceptions\n(we don't know which apps can't be backed up as there is no list online)\n\nDo you want Rookie to uninstall and reinstall the app automatically?", "In place upgrade failed", MessageBoxButtons.OKCancel);
                     if (dialogResult == DialogResult.OK)
                     {
-                        Thread reinstallThread = new Thread(() =>
-                        {
-                            ChangeTitle("Preforming reinstall, please wait...");
-                            ADB.RunAdbCommandToString("kill-server");
-                            ADB.RunAdbCommandToString("devices");
-                            ADB.RunAdbCommandToString($"pull /sdcard/Android/data/{CurrPCKG} \"{Environment.CurrentDirectory}\"");
-                            ADB.RunAdbCommandToString($"shell pm uninstall {CurrPCKG}");
-                            output += ADB.Sideload(CurrAPK);
-                            ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\{CurrPCKG}\" /sdcard/Android/data/");
-                            listappsbtn();
-                            initListView();
-
-                        });
-                        reinstallThread.IsBackground = true;
-                        reinstallThread.Start();
-                        while (reinstallThread.IsAlive)
-                            await Task.Delay(100);
+                        ChangeTitle("Preforming reinstall, please wait...");
+                        ADB.RunAdbCommandToString("kill-server");
+                        ADB.RunAdbCommandToString("devices");
+                        ADB.RunAdbCommandToString($"pull /sdcard/Android/data/{CurrPCKG} \"{Environment.CurrentDirectory}\"");
+                        ADB.RunAdbCommandToString($"shell pm uninstall {CurrPCKG}");
+                        output += ADB.RunAdbCommandToString($"install -g -r \"{CurrAPK}\"");
+                        ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\{CurrPCKG}\" /sdcard/Android/data/");
+                        listappsbtn();
+                        initListView();
+
                         timerticked = false;
                         if (Directory.Exists($"{Environment.CurrentDirectory}\\{CurrPCKG}"))
                             Directory.Delete($"{Environment.CurrentDirectory}\\{CurrPCKG}", true);
                         ChangeTitle("");
+                        ShowPrcOutput(output);
                     }
 
                     else

diff --git a/Updater.cs b/Updater.cs
@@ -17,7 +17,7 @@ class Updater
         private static string RawGitHubUrl;
         private static string GitHubUrl;
 
-        static readonly public string LocalVersion = "2.7";
+        static readonly public string LocalVersion = "2.7.1";
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,42 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+RSL 2.7.1
 
-RSL 2.7
-
-+ Added BMBF drag and drop option for Quest users
-in SETTINGS menu.If users drag and drop BMBF song 
-zip files onto rookie either one by one, an entire 
-folder, or many zips at once Rookie will automatically
-extract the files to a folder then push the folder
-to your device then delete the extraction folder.
-+ Added automatic timeout during APK install that
-will ask user if they'd like Rookie to automatically
-uninstall and reinstall the app. Rookie will check
-for save data and copy it to a folder temporarily
-then put it back after reinstall.
-= Cleaned up startup tasks so booting Rookie should
-be faster.
-= Added automatic deletion of previous crashlog to 
-decrease clutter in Rookie directory.
-= Added automatic installed app refresh after drag
-and drop.
+= Fixed apk path for in-place reinstall. Should work correctly now.
 
 HFP
 
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmENfVMACgkQx/Rql1Vo
-czcxaw//bTVxR5gt1F4c+gDT80dVfJa1Js3h5vSjGgCHjQdmsU6eaU5BQGoUorkw
-6ewYF48jt84xDNj/VirkeqHV95mvsj9sksi+mxvELnAa0NdRVYj0DCqZWB/mNDfx
-lYZGp2SwiGK3a6KfMpPcbi2IEWqc9ZWpdazIDy6l3oGSBAYaoVqfjl+CJQQpomIJ
-x7f67Ei633dyhu8+0612LVu+tZ4ibN2pAAu1Dd5+uvlODUiYLPadhZkLwk+CYC6p
-ifs/1qB/fsXJS6YJyPCmuZCbYN//jLCD9ECQ5cqZbTTU82Ub2lDE+TcdO/CsxSxU
-pueIxZ+7C5TceiNzsDfKfeCWu65hZlBW1xKReDtLPFzZdZuyXYTI0v00kvapwJIO
-C9Eq2qxZvdnp05tw8nY1V4Ae5Jl6oLN0BwWSZv50NhQ4Dpmbl8pemk1r5iZsRhGA
-MWQCytBCaX/3EpJda8ifGJxj3kOno2ewbwXdZEMN7QqWt1scN9HxNXFWEJwO29HV
-pT6ra3T0OrOBLmCQGt4w71HGFK2t+c7aPq0yI/sayguB9zjR/GpTyekg7nHXZh9g
-c+WD5umN2xA0LuLjvvePKhhKTBT6ebmQJh1CRNIRtA150ULbnTAIpZJTDZyhcLXi
-IUfWyWPA4G3GsRUqGWf97O2G2bIbbIzLeg3uEdxF7T9LOigYgpU=
-=Rwj0
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmEOGwkACgkQx/Rql1Vo
+czfPHw//eXtKkM1g/mjz43/BLTjhT1PTrwvolCmds+LzMTHT1EfDyouJBZ2XxnXQ
+NiZkk9SR3m/VmJSr0FO7p7F9Ab07xEUIv280C7Mbqyr0KEPiQTvrlnL/eX4sx/Px
+1pmDCuPUL42u2zo4famGxDvduoVToyPrIzzv3QYt8qJGEAYRG4gtn26SB38+JslU
+eU6hJkB2E7BNZXRtpiDM7rsejOtzsIROdLeIztSyIyTl/sY4Az9nfgRiJFyHsPsJ
+ILRRkquCzkXbzzdjS8AqPPIzt+JZdp+ZZS2H3gSeld4We8rkm5CzBef7pzeP6ZKZ
+WGYnw1Et9dtflSAmfDb6i4Rr5Y3mPLk2OzIeYebZ0fCGmyrpJ7QlRfYqJNJ7JMH9
+DOmsSNVUvFRR+b0FnT414uSg4Q79cYXWsJ/Wi28PIOQF0nQwtPIKly2x1kB4NE7P
+CItXy8VJ//q0/2ijHB3ZQIiMkj78TVePCAC6TQT4RnBgWS0HeItBKZJYCcyvhe72
+6H9qzOVsIKHgxnfbRON9tZOWxpxIdnbFsaE5TsiXp+80SsaHhxcxuAyjh0M0CaKu
+lh3z9FJmZW8CrxIA1G1sQePxqF3iObVhqJPqp8G7N6UC1wBnhJWmnBKTYm1iHs6P
+pj8ggpyFTT55UxGeRklLUyoSxSnqSE7Oj2zluLvBFHPi1KAMlEg=
+=HVQ5
 -----END PGP SIGNATURE-----
diff --git a/version b/version
@@ -1 +1 @@
-2.7
+2.7.1