Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e715bed254 | ||
|
|
1af1acea40 | ||
|
|
060cc07592 | ||
|
|
d3c012cad2 | ||
|
|
20e74eade2 | ||
|
|
d3f9499f03 | ||
|
|
f99c57eb60 | ||
|
|
d7074325f4 | ||
|
|
1ba6fe5260 | ||
|
|
ee6d62950d | ||
|
|
f8fb2b5483 | ||
|
|
164dc070bd | ||
|
|
7539b5c507 | ||
|
|
68be50b26e | ||
|
|
6cbe06f394 | ||
|
|
a9f2db6380 | ||
|
|
4a492ffcd2 | ||
|
|
b5c66b50b9 | ||
|
|
ebfe5ace65 | ||
|
|
c242dc6f6d |
10
ADB.cs
10
ADB.cs
@@ -14,7 +14,7 @@ namespace AndroidSideloader
|
||||
class ADB
|
||||
{
|
||||
static Process adb = new Process();
|
||||
public static string adbFolderPath = "C:\\RSL\\2.8.2\\ADB";
|
||||
public static string adbFolderPath = "C:\\RSL\\platform-tools";
|
||||
public static string adbFilePath = adbFolderPath + "\\adb.exe";
|
||||
public static string DeviceID = "";
|
||||
public static string package = "";
|
||||
@@ -91,10 +91,6 @@ namespace AndroidSideloader
|
||||
public static ProcessOutput RunAdbCommandToStringWOADB(string result, string path)
|
||||
{
|
||||
string command = result;
|
||||
Properties.Settings.Default.ADBFolder = adbFolderPath;
|
||||
Properties.Settings.Default.ADBPath = adbFilePath;
|
||||
Properties.Settings.Default.Save();
|
||||
|
||||
string logcmd = command;
|
||||
if (logcmd.Contains(Environment.CurrentDirectory))
|
||||
logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
|
||||
@@ -161,10 +157,6 @@ namespace AndroidSideloader
|
||||
public static ProcessOutput RunCommandToString(string result, string path = "")
|
||||
{
|
||||
string command = result;
|
||||
Properties.Settings.Default.ADBFolder = adbFolderPath;
|
||||
Properties.Settings.Default.ADBPath = adbFilePath;
|
||||
Properties.Settings.Default.Save();
|
||||
|
||||
string logcmd = command;
|
||||
if (logcmd.Contains(Environment.CurrentDirectory))
|
||||
logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
|
||||
|
||||
@@ -269,6 +269,7 @@
|
||||
<None Include="Resources\battery1.png" />
|
||||
<None Include="Resources\ajax-loader.gif" />
|
||||
<Content Include="Resources\bluekey.png" />
|
||||
<None Include="Resources\gametoupload.png" />
|
||||
<Content Include="Resources\redkey.png" />
|
||||
<None Include="Resources\greenkey.png" />
|
||||
<None Include="Resources\orangekey.png" />
|
||||
|
||||
12
App.config
12
App.config
@@ -173,6 +173,18 @@
|
||||
<setting name="AutoReinstall" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="NonAppPackages" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="LastLaunch" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="SubmittedUpdates" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="ListUpped" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
</AndroidSideloader.Properties.Settings>
|
||||
<AndroidADB.Sideloader.Properties.Settings>
|
||||
<setting name="checkForUpdates" serializeAs="String">
|
||||
|
||||
@@ -1,6 +1,175 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
RSL 2.9.7
|
||||
|
||||
= Fixed bug that caused error message to appear
|
||||
when no device is connected to PC.
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmEuDXUACgkQx/Rql1Vo
|
||||
czfmuRAAmwwn2DE1Qu0sDcWFhFF91ApPkjKNbWS1m+Kqi5Zu+Yb1XB3R4U7CVb8n
|
||||
SfzR3khr0CD9EodJJZkwTmZJYABgNNy1jCp2HsEYG1DhJUfcJ1uIjdwvPqQpqex5
|
||||
unGiLusEr1WpNp1Vuk9rBvvZOcH1ci/mRWqWdj6W6CLzZ5R3TeN0fKIFJ4B7ea7m
|
||||
zRNGBA6i3YkP9jbUy16w8J6mYGzvHLg+ZfASG4jCOSyo4p+RQNWhDJEugjw+YImb
|
||||
vQWiGedfr2c945Bo8Noaul8Pjh61ds1uN4AkobTVWNJIY/IpREFFjY/hoc/fhx9s
|
||||
H3JPdJi3iaKq0dqhyNp8nlm4sv3y6bX9hXc0YWQMXjkzLg5ug1hHEMIIVk+tS+uU
|
||||
bf8h+dVshYovE+N+4fjSz+hG9kzE9I6nvtI+gLpTJdxCyCXjjxlldrmuVE6nMd83
|
||||
bDkKMJvb7Eo9KdIHmxs97TSZcjdfJEazzVXbs+dDmEJ9rGJYFIqydTQ/Pol4afvw
|
||||
/tr0AmYUxCnkLgufmKjeX3Z/UVAzAs02MuT/Z639YwNoOtvg1bUzwWAzUQLwMdqV
|
||||
P+d0xJQSEEr65GiwgdSsQY1R/uaGnggTXwIQwmkZPjJuUyNDD6h0zRcEKplDt7nd
|
||||
jgjJJbVGLafcGLE1OahLlPnbMB24lWvfQM9ST0GuYWaINHCrQcI=
|
||||
=XacL
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
RSL 2.9.6
|
||||
|
||||
=Fixed obb copy for similarly named apps.
|
||||
|
||||
=Added packagename to shared app zips.
|
||||
|
||||
=Fixed laggy upload when sharing apps.
|
||||
|
||||
HFP
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmEtk1MACgkQx/Rql1Vo
|
||||
czcn4g//RvtKxuXtBNxisnxncuXkq559ZX2zb7AN2mf31fUmv3lHtF2IVJnXfb0Z
|
||||
gSPJocUNgO7Hf3jyAoKF+zRxF2TrSsg48S17DWFWxxMZ6fA6we6yWh7Gk7FYTUin
|
||||
r8uoq1IyF0YMix4NRIinCO+2NFo5aniNi8N1R3IW8F11aeN0i4FRICgpIVuBdzxV
|
||||
LCg1Q4vAbWHtOOFH3YZvNBkOl1GIV8IYQT4Kr0y7MShl3C7IsVDFsdR2nfScQRhL
|
||||
iDGH2VXULWm/pUk9AVMQsq3AezVyoONIQEjzs5Wz6D/yiB4faZ9VDLmJ4KbXCsfG
|
||||
FS6JYh8fnJvt2iTZ0YaIsKm1FeuCISdOioTqcpNd+DvKxySw8rJv2t6yRSV5u2l3
|
||||
ZxPXp48DLJCkgSQSJMeG/JiNZigDzG0ydenRYZkZtpWNsDRVUx/F/REKXevvlLIj
|
||||
G/Ng0og85tl6XypFzWMMR6ISE3Cj6xkzSkkXluSelZRdx9NeV2UKl5D07tZ5V8f4
|
||||
VooJqK1qBn+OXhdPRHIm8pOicvUwKaKCrIrWi2yyvFHDaTQDpUo1jc2WEqCBwSoZ
|
||||
/f/R5G7lM0KdWXVdMSZleNoO2lhUujS40uQ4ycelzBlzm0qMotpeq9E/QHlCQ3d3
|
||||
pe7uMX6RDlrH09iWG55XHHWXSfDKHFMhPztRcI6apFR3hVA/fHE=
|
||||
=Ty3D
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
RSL 2.9.5
|
||||
Hotfix for online issue.
|
||||
-pmow
|
||||
|
||||
|
||||
RSL 2.9.4
|
||||
|
||||
= Changed install.txt logic to search
|
||||
for any .7z files and use Zip Extract
|
||||
function from GeneralUtilities, should
|
||||
fix version issues with users who have
|
||||
a newer 7zip installed than the 7zip
|
||||
exe included with install.txt games.
|
||||
|
||||
= Fully moved ADB folder to
|
||||
C:\RSL\platform-rools and removed
|
||||
adb folder from Rookie directory.
|
||||
Rookie will do this automatically upon
|
||||
first launch after updating. This will
|
||||
make updating to future versions of ADB
|
||||
much smoother. This should also fix issues
|
||||
caused by having multiple version of
|
||||
adb.exe clashing and fix AAPT issues as
|
||||
well.
|
||||
|
||||
= Updated 7z.exe and 7z.dll on Github.
|
||||
|
||||
HFP
|
||||
|
||||
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
RSL 2.9.4
|
||||
|
||||
= Changed install.txt logic to search
|
||||
for any .7z files and use Zip Extract
|
||||
function from GeneralUtilities, should
|
||||
fix version issues with users who have
|
||||
a newer 7zip installed than the 7zip
|
||||
exe included with install.txt games.
|
||||
|
||||
= Fully moved ADB folder to
|
||||
C:\RSL\platform-rools and removed
|
||||
adb folder from Rookie directory.
|
||||
Rookie will do this automatically upon
|
||||
first launch after updating. This will
|
||||
make updating to future versions of ADB
|
||||
much smoother. This should also fix issues
|
||||
caused by having multiple version of
|
||||
adb.exe clashing and fix AAPT issues as
|
||||
well.
|
||||
|
||||
= Updated 7z.exe and 7z.dll on Github.
|
||||
|
||||
HFP
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmEsQnoACgkQx/Rql1Vo
|
||||
czeKPRAAi0l9Ti06d48p0vd6Rziw3mHLVXg5dDOZWyrNULu1Y8axnSCVnZOVduVD
|
||||
ftY0fVjTNNv7aU+fyWtH2Gr33CtJ6DvaQpj5RIsFiZpiTeDN3cOq2Ina55jtVvEl
|
||||
ZrBVlLdXtv/L/W3ltrMzc/sNnJhrEfBXq7lNDFMj7IT31miphRZ1X9pgIdqGIpdE
|
||||
gwcVxxkOu/5PXMzR3+eclpVePeagtJQNBH8dYUBQ9OziKObpzAfVYvoYS94MTYUY
|
||||
ZdoHP5tfXEsuW0tQ6G1dvGrIi+ty8EJWX3GS42mkPW6xlyKbSOdu/IQa4KFPmpkK
|
||||
7QwCMDzU5FgxJhg4+j35z/4BxJUzUHeTnp2xQYw/HE+GWdiJklIpZoOeqFQ+QLy/
|
||||
6jwyhqcPD7cni2HMrCi4HxT0GcuVV5jrqqBAtCHdecglH90EMBCS9DrvmZyw1JgA
|
||||
b9bCPQwWvVRLFw8HfiybiqVM98C2kW3TUsprGJOcnT6l1SzKlHEwiSMJSTVWshuu
|
||||
bG8Q19gfhKSLEjTdjKVYV9WDHp8it+lrF6ETdneP4kcSsLhigYSgz0AeETx62Ugh
|
||||
D13MyxcS6K9XqoRGy5Dr3gL/qkT0I5T6dsWL6vj9o317uexIO9sPkmrGTktbGUn1
|
||||
heW2jD324PwyuuPxxoqM1lVKVquUIS0Difx+cqlJHY0lWqIk/Ck=
|
||||
=lZeM
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
RSL 2.9.3
|
||||
|
||||
+ Added new background color for apps that are a newer
|
||||
version than the version on the list. If you see this
|
||||
darker background please agree to share when prompted
|
||||
upon program launch or alternatively select the game
|
||||
from top drop-down installed apps list and click Share
|
||||
Selected App to help the community!
|
||||
|
||||
+ Added logic for file size column, clicking the column
|
||||
header will now properly sort from biggest to smallest
|
||||
or vice versa.
|
||||
|
||||
= Fixed issue where Rookie would ask for every single
|
||||
app installed on user's device. It should now only ask
|
||||
for apps not on Rookie and not on the Blacklist as
|
||||
intended.
|
||||
|
||||
= Changed zip file naming for new game uploads to use
|
||||
Release Name instead of package name.
|
||||
|
||||
HFP
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmEpvs8ACgkQx/Rql1Vo
|
||||
czc4kg//fgCG0ChVfIVl48I2dww4ZJmRI+sQm/S4Ry38M4NzM+SdKOQVnDFgZ68p
|
||||
e/z2VqECc4wPlhqrxh+xHoMzlkfrz8LdpsU3cch6jo9uERpaWMj2X1E5jKFRc7iS
|
||||
4/v6XvSBnp/ZSak3f7DUubNnsCcq6vDH4w1ugzv71AyW9STG7oUXQb+kNQNsQ1RO
|
||||
WNJjO87RAlHivUuff7wRLlhVKLo21DvZ+MJRmMRzXH5tMxnEGxWeTOkAoWvsDjMa
|
||||
1L6rmugC9K7X3Qqi09f1ZyUQG6F++fpoDf8u5QB96DegV+IZGjOsBcvL7wE9fdox
|
||||
RxhFxZMsnQtO4kuo3c/iFg7ohxP+pQ5ayk0IzDRwdjfIYX+w+20LdkGpxsThxHvp
|
||||
fWZBUCW0nwBFxBjxItXq8dIn7KHsDc3AkNcI2Ox+4eIUoKwuqzr0wCjPaB4dLLLZ
|
||||
Ofa1tt25ugl7rSTI4doKEH1YmTlzdOuuSKaA2vIMH6L54gpy+h2DkdAQkSEl0PRJ
|
||||
fApOwvUJqnat/Pipg2PTaJSiZd/lLoImWXdhOdlT2XA/9olD0oLGW/DmK+jjH2GK
|
||||
Sxd+sLDHUDyujH263yemu1No7+3Zf+iyE+8LTikYj0mVG3SX8tfG/5cOXbQAp2pv
|
||||
h9CmnbkKBVy8+RXMHKW8MJhsqCS2/wDIJSGYbxwAge3vSe70UWA=
|
||||
=d6JO
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
RSL 2.9.2
|
||||
|
||||
+ Added option in settings menu
|
||||
|
||||
@@ -59,7 +59,7 @@ public class ListViewColumnSorter : IComparer
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else if(xNum > yNum && OrderOfSort == SortOrder.Descending)
|
||||
else if(xNum > yNum && OrderOfSort == SortOrder.Ascending)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
124
MainForm.Designer.cs
generated
124
MainForm.Designer.cs
generated
@@ -42,9 +42,7 @@
|
||||
this.downloadInstallGameButton = new System.Windows.Forms.Button();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.ULLabel = new System.Windows.Forms.Label();
|
||||
this.ULGif = new System.Windows.Forms.PictureBox();
|
||||
this.BatteryLbl = new System.Windows.Forms.Label();
|
||||
this.pictureBox5 = new System.Windows.Forms.PictureBox();
|
||||
this.downloadingLabel = new System.Windows.Forms.Label();
|
||||
this.aboutBtn = new System.Windows.Forms.Button();
|
||||
this.settingsButton = new System.Windows.Forms.Button();
|
||||
@@ -89,21 +87,28 @@
|
||||
this.ADBcommandbox = new System.Windows.Forms.TextBox();
|
||||
this.label11 = new System.Windows.Forms.Label();
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
this.pictureBox7 = new System.Windows.Forms.PictureBox();
|
||||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.pictureBox6 = new System.Windows.Forms.PictureBox();
|
||||
this.pictureBox4 = new System.Windows.Forms.PictureBox();
|
||||
this.pictureBox3 = new System.Windows.Forms.PictureBox();
|
||||
this.pictureBox2 = new System.Windows.Forms.PictureBox();
|
||||
this.gamesPictureBox = new System.Windows.Forms.PictureBox();
|
||||
this.ULGif = new System.Windows.Forms.PictureBox();
|
||||
this.pictureBox5 = new System.Windows.Forms.PictureBox();
|
||||
this.panel1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.ULGif)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
|
||||
this.otherContainer.SuspendLayout();
|
||||
this.backupContainer.SuspendLayout();
|
||||
this.sideloadContainer.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.ULGif)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// m_combo
|
||||
@@ -119,7 +124,7 @@
|
||||
this.m_combo.Name = "m_combo";
|
||||
this.m_combo.Size = new System.Drawing.Size(353, 26);
|
||||
this.m_combo.TabIndex = 0;
|
||||
this.m_combo.Text = "Select an app to uninstall or extract...";
|
||||
this.m_combo.Text = "Select an Installed App to Uninstall or Share...";
|
||||
//
|
||||
// startsideloadbutton
|
||||
//
|
||||
@@ -383,17 +388,6 @@
|
||||
this.ULLabel.Text = "Uploading";
|
||||
this.ULLabel.Visible = false;
|
||||
//
|
||||
// ULGif
|
||||
//
|
||||
this.ULGif.Enabled = false;
|
||||
this.ULGif.Image = global::AndroidSideloader.Properties.Resources.ajax_loader;
|
||||
this.ULGif.Location = new System.Drawing.Point(178, 699);
|
||||
this.ULGif.Name = "ULGif";
|
||||
this.ULGif.Size = new System.Drawing.Size(34, 17);
|
||||
this.ULGif.TabIndex = 86;
|
||||
this.ULGif.TabStop = false;
|
||||
this.ULGif.Visible = false;
|
||||
//
|
||||
// BatteryLbl
|
||||
//
|
||||
this.BatteryLbl.AutoSize = true;
|
||||
@@ -407,17 +401,6 @@
|
||||
this.BatteryLbl.TabIndex = 84;
|
||||
this.BatteryLbl.Text = "N/A%";
|
||||
//
|
||||
// pictureBox5
|
||||
//
|
||||
this.pictureBox5.BackColor = System.Drawing.Color.Transparent;
|
||||
this.pictureBox5.Image = global::AndroidSideloader.Properties.Resources.battery11;
|
||||
this.pictureBox5.Location = new System.Drawing.Point(155, 576);
|
||||
this.pictureBox5.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.pictureBox5.Name = "pictureBox5";
|
||||
this.pictureBox5.Size = new System.Drawing.Size(55, 29);
|
||||
this.pictureBox5.TabIndex = 85;
|
||||
this.pictureBox5.TabStop = false;
|
||||
//
|
||||
// downloadingLabel
|
||||
//
|
||||
this.downloadingLabel.AutoSize = true;
|
||||
@@ -1089,7 +1072,7 @@
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.label6.ForeColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
this.label6.Location = new System.Drawing.Point(828, 12);
|
||||
this.label6.Location = new System.Drawing.Point(828, 9);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(145, 17);
|
||||
this.label6.TabIndex = 90;
|
||||
@@ -1102,7 +1085,7 @@
|
||||
this.label7.AutoSize = true;
|
||||
this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.label7.ForeColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
this.label7.Location = new System.Drawing.Point(828, 41);
|
||||
this.label7.Location = new System.Drawing.Point(828, 29);
|
||||
this.label7.Name = "label7";
|
||||
this.label7.Size = new System.Drawing.Size(98, 17);
|
||||
this.label7.TabIndex = 90;
|
||||
@@ -1193,13 +1176,54 @@
|
||||
this.label9.TextAlign = System.Drawing.ContentAlignment.TopCenter;
|
||||
this.label9.Visible = false;
|
||||
//
|
||||
// pictureBox7
|
||||
//
|
||||
this.pictureBox7.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pictureBox7.BackColor = System.Drawing.Color.Transparent;
|
||||
this.pictureBox7.DataBindings.Add(new System.Windows.Forms.Binding("ImageLocation", global::AndroidSideloader.Properties.Settings.Default, "BackPicturePath", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
|
||||
this.pictureBox7.ErrorImage = null;
|
||||
this.pictureBox7.ImageLocation = global::AndroidSideloader.Properties.Settings.Default.BackPicturePath;
|
||||
this.pictureBox7.InitialImage = null;
|
||||
this.pictureBox7.Location = new System.Drawing.Point(217, 18);
|
||||
this.pictureBox7.Name = "pictureBox7";
|
||||
this.pictureBox7.Size = new System.Drawing.Size(764, 718);
|
||||
this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
this.pictureBox7.TabIndex = 74;
|
||||
this.pictureBox7.TabStop = false;
|
||||
this.pictureBox7.Click += new System.EventHandler(this.pictureBox1_Click);
|
||||
//
|
||||
// label10
|
||||
//
|
||||
this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label10.AutoSize = true;
|
||||
this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
|
||||
this.label10.ForeColor = System.Drawing.SystemColors.ControlLightLight;
|
||||
this.label10.Location = new System.Drawing.Point(828, 49);
|
||||
this.label10.Name = "label10";
|
||||
this.label10.Size = new System.Drawing.Size(135, 17);
|
||||
this.label10.TabIndex = 90;
|
||||
this.label10.Text = "= Newer than List";
|
||||
this.label10.TextAlign = System.Drawing.ContentAlignment.TopCenter;
|
||||
//
|
||||
// pictureBox6
|
||||
//
|
||||
this.pictureBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pictureBox6.Image = global::AndroidSideloader.Properties.Resources.gametoupload;
|
||||
this.pictureBox6.Location = new System.Drawing.Point(803, 49);
|
||||
this.pictureBox6.Name = "pictureBox6";
|
||||
this.pictureBox6.Size = new System.Drawing.Size(19, 17);
|
||||
this.pictureBox6.TabIndex = 92;
|
||||
this.pictureBox6.TabStop = false;
|
||||
//
|
||||
// pictureBox4
|
||||
//
|
||||
this.pictureBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pictureBox4.Image = global::AndroidSideloader.Properties.Resources.greenkey;
|
||||
this.pictureBox4.Location = new System.Drawing.Point(803, 39);
|
||||
this.pictureBox4.Location = new System.Drawing.Point(803, 29);
|
||||
this.pictureBox4.Name = "pictureBox4";
|
||||
this.pictureBox4.Size = new System.Drawing.Size(21, 20);
|
||||
this.pictureBox4.Size = new System.Drawing.Size(19, 17);
|
||||
this.pictureBox4.TabIndex = 92;
|
||||
this.pictureBox4.TabStop = false;
|
||||
//
|
||||
@@ -1207,9 +1231,9 @@
|
||||
//
|
||||
this.pictureBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pictureBox3.Image = global::AndroidSideloader.Properties.Resources.orangekey;
|
||||
this.pictureBox3.Location = new System.Drawing.Point(803, 10);
|
||||
this.pictureBox3.Location = new System.Drawing.Point(803, 9);
|
||||
this.pictureBox3.Name = "pictureBox3";
|
||||
this.pictureBox3.Size = new System.Drawing.Size(21, 20);
|
||||
this.pictureBox3.Size = new System.Drawing.Size(19, 17);
|
||||
this.pictureBox3.TabIndex = 92;
|
||||
this.pictureBox3.TabStop = false;
|
||||
//
|
||||
@@ -1235,6 +1259,28 @@
|
||||
this.gamesPictureBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
|
||||
this.gamesPictureBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
|
||||
//
|
||||
// ULGif
|
||||
//
|
||||
this.ULGif.Enabled = false;
|
||||
this.ULGif.Image = global::AndroidSideloader.Properties.Resources.ajax_loader;
|
||||
this.ULGif.Location = new System.Drawing.Point(178, 699);
|
||||
this.ULGif.Name = "ULGif";
|
||||
this.ULGif.Size = new System.Drawing.Size(34, 17);
|
||||
this.ULGif.TabIndex = 86;
|
||||
this.ULGif.TabStop = false;
|
||||
this.ULGif.Visible = false;
|
||||
//
|
||||
// pictureBox5
|
||||
//
|
||||
this.pictureBox5.BackColor = System.Drawing.Color.Transparent;
|
||||
this.pictureBox5.Image = global::AndroidSideloader.Properties.Resources.battery11;
|
||||
this.pictureBox5.Location = new System.Drawing.Point(155, 576);
|
||||
this.pictureBox5.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.pictureBox5.Name = "pictureBox5";
|
||||
this.pictureBox5.Size = new System.Drawing.Size(55, 29);
|
||||
this.pictureBox5.TabIndex = 85;
|
||||
this.pictureBox5.TabStop = false;
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AllowDrop = true;
|
||||
@@ -1245,9 +1291,11 @@
|
||||
this.Controls.Add(this.label4);
|
||||
this.Controls.Add(this.EnterInstallBox);
|
||||
this.Controls.Add(this.ProgressText);
|
||||
this.Controls.Add(this.pictureBox6);
|
||||
this.Controls.Add(this.pictureBox4);
|
||||
this.Controls.Add(this.pictureBox3);
|
||||
this.Controls.Add(this.pictureBox2);
|
||||
this.Controls.Add(this.label10);
|
||||
this.Controls.Add(this.label7);
|
||||
this.Controls.Add(this.label6);
|
||||
this.Controls.Add(this.label8);
|
||||
@@ -1274,6 +1322,7 @@
|
||||
this.Controls.Add(this.label2);
|
||||
this.Controls.Add(this.gamesListView);
|
||||
this.Controls.Add(this.pictureBox1);
|
||||
this.Controls.Add(this.pictureBox7);
|
||||
this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
|
||||
this.MaximizeBox = false;
|
||||
this.Name = "MainForm";
|
||||
@@ -1288,16 +1337,18 @@
|
||||
this.DragLeave += new System.EventHandler(this.Form1_DragLeave);
|
||||
this.panel1.ResumeLayout(false);
|
||||
this.panel1.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.ULGif)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
|
||||
this.otherContainer.ResumeLayout(false);
|
||||
this.backupContainer.ResumeLayout(false);
|
||||
this.sideloadContainer.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.ULGif)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
@@ -1369,6 +1420,9 @@
|
||||
public System.Windows.Forms.ComboBox remotesList;
|
||||
private System.Windows.Forms.PictureBox ULGif;
|
||||
private System.Windows.Forms.Label ULLabel;
|
||||
private System.Windows.Forms.PictureBox pictureBox6;
|
||||
private System.Windows.Forms.PictureBox pictureBox7;
|
||||
private System.Windows.Forms.Label label10;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
236
MainForm.cs
236
MainForm.cs
@@ -47,29 +47,52 @@ namespace AndroidSideloader
|
||||
#endif
|
||||
|
||||
private bool isLoading = true;
|
||||
|
||||
public MainForm()
|
||||
|
||||
{
|
||||
InitializeComponent();
|
||||
if (Properties.Settings.Default.LastLaunch == null)
|
||||
{
|
||||
Properties.Settings.Default.LastLaunch = DateTime.Now;
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
//Time between asking for new apps if user clicks No.
|
||||
TimeSpan newDayReference = new TimeSpan(48, 0, 0);
|
||||
//Time between asking for updates after uploading.
|
||||
TimeSpan newDayReference2 = new TimeSpan(72, 0, 0);
|
||||
TimeSpan comparison;
|
||||
|
||||
//These two variables set to show difference.
|
||||
DateTime A = Properties.Settings.Default.LastLaunch;
|
||||
DateTime B = DateTime.Now;
|
||||
comparison = B - A;
|
||||
// If enough time has passed reset property containing packagenames
|
||||
if (comparison > newDayReference)
|
||||
{
|
||||
Properties.Settings.Default.ListUpped = false;
|
||||
Properties.Settings.Default.NonAppPackages = "";
|
||||
Properties.Settings.Default.LastLaunch = DateTime.Now;
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
if (comparison > newDayReference2)
|
||||
{
|
||||
Properties.Settings.Default.SubmittedUpdates = "";
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
string launchtime = DateTime.Now.ToString("hh:mmtt(UTC)");
|
||||
if (String.IsNullOrEmpty(Properties.Settings.Default.CurrentLogPath))
|
||||
{
|
||||
|
||||
if (File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
|
||||
{
|
||||
string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
|
||||
Random r = new Random();
|
||||
int x = r.Next(6806);
|
||||
int y = r.Next(6806);
|
||||
|
||||
|
||||
string randomnoun = lines[new Random(x).Next(lines.Length)];
|
||||
string randomnoun2 = lines[new Random(y).Next(lines.Length)];
|
||||
string combined = randomnoun + "-" + randomnoun2;
|
||||
Properties.Settings.Default.CurrentLogPath = Environment.CurrentDirectory + "\\" + combined + ".txt";
|
||||
Properties.Settings.Default.CurrentLogName = combined;
|
||||
Properties.Settings.Default.Save();
|
||||
if (File.Exists($"{Environment.CurrentDirectory}\\debuglog.txt"))
|
||||
System.IO.File.Move("debuglog.txt", combined + ".txt");
|
||||
Properties.Settings.Default.Save();
|
||||
@@ -80,7 +103,7 @@ namespace AndroidSideloader
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Logger.Log($"-----------------\n-----------------\nProgram Launched at {launchtime}-----------------\n\n-----------------");
|
||||
System.Windows.Forms.Timer t = new System.Windows.Forms.Timer();
|
||||
t.Interval = 840000; // 14 mins between wakeup commands
|
||||
t.Tick += new EventHandler(timer_Tick);
|
||||
@@ -113,10 +136,12 @@ namespace AndroidSideloader
|
||||
Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
|
||||
Properties.Settings.Default.Save();
|
||||
CheckForInternet();
|
||||
if (HasInternet == true)
|
||||
if (HasInternet == true) {
|
||||
Sideloader.downloadFiles();
|
||||
else
|
||||
}
|
||||
else {
|
||||
FlexibleMessageBox.Show("Cannot connect to google dns, your internet may be down, won't use rclone or online features!");
|
||||
}
|
||||
await Task.Delay(100);
|
||||
ADB.RunAdbCommandToString("kill-server");
|
||||
if (!String.IsNullOrEmpty(Properties.Settings.Default.IPAddress))
|
||||
@@ -227,6 +252,8 @@ namespace AndroidSideloader
|
||||
|
||||
ChangeTitle("Initializing Mirrors");
|
||||
initMirrors(true);
|
||||
ChangeTitle("Checking if config is updated and updating config");
|
||||
SideloaderRCLONE.updateConfig(currentRemote);
|
||||
ChangeTitle("Initializing Games");
|
||||
SideloaderRCLONE.initGames(currentRemote);
|
||||
//ChangeTitle("Syncing Game Photos");
|
||||
@@ -267,31 +294,25 @@ namespace AndroidSideloader
|
||||
t3.Start();
|
||||
t4.Start();
|
||||
}
|
||||
while (t2.IsAlive || t3.IsAlive || t4.IsAlive)
|
||||
await Task.Delay(100);
|
||||
|
||||
while (t2.IsAlive)
|
||||
await Task.Delay(100);
|
||||
while (t3.IsAlive)
|
||||
await Task.Delay(100);
|
||||
while (t4.IsAlive)
|
||||
await Task.Delay(100);
|
||||
ChangeTitle("Loaded");
|
||||
|
||||
progressBar.Style = ProgressBarStyle.Marquee;
|
||||
Thread configThread = new Thread(() =>
|
||||
{
|
||||
ChangeTitle("Checking if config is updated and updating config");
|
||||
SideloaderRCLONE.updateConfig(currentRemote);
|
||||
|
||||
});
|
||||
configThread.IsBackground = true;
|
||||
configThread.Start();
|
||||
while (configThread.IsAlive)
|
||||
await Task.Delay(100);
|
||||
ChangeTitle("Populating update list, please wait...\n\n");
|
||||
listappsbtn();
|
||||
initListView();
|
||||
showAvailableSpace();
|
||||
intToolTips();
|
||||
ChangeTitle(" \n\n");
|
||||
downloadInstallGameButton.Enabled = true;
|
||||
progressBar.Style = ProgressBarStyle.Continuous;
|
||||
isLoading = false;
|
||||
initListView();
|
||||
}
|
||||
|
||||
|
||||
@@ -340,7 +361,7 @@ namespace AndroidSideloader
|
||||
try
|
||||
{
|
||||
if (ProgressText.IsDisposed) return;
|
||||
this.Invoke(() => { oldTitle = txt; this.Text = "Rookie's Sideloader | " + txt; });
|
||||
this.Invoke(() => { oldTitle = txt; this.Text = "Rookie's Sideloader v" + Updater.LocalVersion + " | " + txt; });
|
||||
ProgressText.Invoke(() =>
|
||||
{
|
||||
if (!ProgressText.IsDisposed)
|
||||
@@ -349,7 +370,7 @@ namespace AndroidSideloader
|
||||
if (!reset)
|
||||
return;
|
||||
await Task.Delay(TimeSpan.FromSeconds(5));
|
||||
this.Invoke(() => { this.Text = "Rookie's Sideloader | " + oldTitle; });
|
||||
this.Invoke(() => { this.Text = "Rookie's Sideloader v" + Updater.LocalVersion + " | " + oldTitle; });
|
||||
ProgressText.Invoke(() =>
|
||||
{
|
||||
if (!ProgressText.IsDisposed)
|
||||
@@ -952,20 +973,6 @@ namespace AndroidSideloader
|
||||
string path = $"{dir}\\Install.txt";
|
||||
if (Directory.Exists(data))
|
||||
{
|
||||
|
||||
Program.form.ChangeTitle($"Copying {data} to device...");
|
||||
|
||||
Thread t1 = new Thread(() =>
|
||||
|
||||
{
|
||||
output += ADB.CopyOBB(data);
|
||||
});
|
||||
t1.IsBackground = true;
|
||||
t1.Start();
|
||||
|
||||
while (t1.IsAlive)
|
||||
await Task.Delay(100);
|
||||
|
||||
Program.form.ChangeTitle($"");
|
||||
string extension = Path.GetExtension(data);
|
||||
if (extension == ".apk")
|
||||
@@ -1009,10 +1016,10 @@ namespace AndroidSideloader
|
||||
{
|
||||
if (file2.EndsWith(".apk"))
|
||||
{
|
||||
string pathname = Path.GetDirectoryName(data);
|
||||
string pathname = Path.GetDirectoryName(file2);
|
||||
string filename = file2.Replace($"{pathname}\\", "");
|
||||
|
||||
string cmd = $"\"{Properties.Settings.Default.MainDir}\\adb\\aapt.exe\" dump badging \"{file2}\" | findstr -i \"package: name\"";
|
||||
string cmd = $"C:\\RSL\\platform-tools\\aapt.exe\" dump badging \"{file2}\" | findstr -i \"package: name\"";
|
||||
string cmdout = ADB.RunCommandToString(cmd, file2).Output;
|
||||
cmdout = Utilities.StringUtilities.RemoveEverythingBeforeFirst(cmdout, "=");
|
||||
cmdout = Utilities.StringUtilities.RemoveEverythingAfterFirst(cmdout, " ");
|
||||
@@ -1035,6 +1042,18 @@ namespace AndroidSideloader
|
||||
while (t2.IsAlive)
|
||||
await Task.Delay(100);
|
||||
t3.Stop();
|
||||
if (Directory.Exists($"{pathname}\\{cmdout}"))
|
||||
{
|
||||
Program.form.ChangeTitle($"Copying obb folder to device...");
|
||||
Thread t1 = new Thread(() =>
|
||||
{
|
||||
ADB.RunAdbCommandToString($"push \"{pathname}\\{cmdout}\" /sdcard/Android/obb/");
|
||||
});
|
||||
t1.IsBackground = true;
|
||||
t1.Start();
|
||||
while (t1.IsAlive)
|
||||
await Task.Delay(100);
|
||||
}
|
||||
}
|
||||
|
||||
if (file2.EndsWith(".zip") && Properties.Settings.Default.BMBFchecked)
|
||||
@@ -1118,7 +1137,7 @@ namespace AndroidSideloader
|
||||
{
|
||||
string pathname = Path.GetDirectoryName(data);
|
||||
string dataname = data.Replace($"{pathname}\\", "");
|
||||
string cmd = $"\"{Properties.Settings.Default.MainDir}\\adb\\aapt.exe\" dump badging \"{data}\" | findstr -i \"package: name\"";
|
||||
string cmd = $"\"C:\\RSL\\platform-tools\\aapt.exe\" dump badging \"{data}\" | findstr -i \"package: name\"";
|
||||
string cmdout = ADB.RunCommandToString(cmd, data).Output;
|
||||
cmdout = Utilities.StringUtilities.RemoveEverythingBeforeFirst(cmdout, "=");
|
||||
cmdout = Utilities.StringUtilities.RemoveEverythingAfterFirst(cmdout, " ");
|
||||
@@ -1134,19 +1153,29 @@ namespace AndroidSideloader
|
||||
ChangeTitle($"Installing {dataname}...");
|
||||
|
||||
Thread t1 = new Thread(() =>
|
||||
|
||||
{
|
||||
output += ADB.Sideload(data);
|
||||
});
|
||||
t1.IsBackground = true;
|
||||
t1.Start();
|
||||
|
||||
while (t1.IsAlive)
|
||||
await Task.Delay(100);
|
||||
|
||||
timer.Stop();
|
||||
|
||||
ChangeTitle(" \n\n");
|
||||
if (Directory.Exists($"{pathname}\\{cmdout}"))
|
||||
{
|
||||
Program.form.ChangeTitle($"Copying obb folder to device...");
|
||||
Thread t2 = new Thread(() =>
|
||||
{
|
||||
ADB.RunAdbCommandToString($"push \"{pathname}\\{cmdout}\" /sdcard/Android/obb/");
|
||||
});
|
||||
t2.IsBackground = true;
|
||||
t2.Start();
|
||||
while (t2.IsAlive)
|
||||
await Task.Delay(100);
|
||||
|
||||
ChangeTitle(" \n\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
//If obb is dragged and dropped alone onto Rookie, Rookie will recreate its obb folder automatically with this code.
|
||||
@@ -1283,30 +1312,18 @@ namespace AndroidSideloader
|
||||
}
|
||||
List<ListViewItem> GameList = new List<ListViewItem>();
|
||||
List<String> rookieList = new List<String>();
|
||||
foreach (string[] game in SideloaderRCLONE.games)
|
||||
{
|
||||
rookieList.Add(game[SideloaderRCLONE.PackageNameIndex]);
|
||||
}
|
||||
|
||||
List<String> installedGames = packageList.ToList();
|
||||
List<String> blacklistItems = blacklist.ToList();
|
||||
List<String> whitelistItems = whitelist.ToList();
|
||||
errorOnList = false;
|
||||
if (installedGames.Count == 0 || blacklistItems.Count == 0)
|
||||
{
|
||||
//This means either the user does not have headset connected or the blacklist
|
||||
//did not load, so we are just going to skip everything
|
||||
errorOnList = true;
|
||||
FlexibleMessageBox.Show($"Rookie seems to have failed to load some files. Try restarting a few times rookie. If error persists resintall. Also don't use a VPN. If error persists post problem on telegram.", "Error loading blacklist or game list!");
|
||||
}
|
||||
|
||||
//This is for black list, but temporarly will be whitelist
|
||||
newGamesList = installedGames.Except(rookieList).Except(blacklistItems).ToList();
|
||||
//this list has games that we are actually going to upload
|
||||
newGamesToUploadList = whitelistItems.Intersect(installedGames).ToList();
|
||||
|
||||
foreach (string[] release in SideloaderRCLONE.games)
|
||||
{
|
||||
rookieList.Add(release[SideloaderRCLONE.PackageNameIndex].ToString());
|
||||
if (!rookienamelist.Contains(release[SideloaderRCLONE.GameNameIndex].ToString()))
|
||||
{
|
||||
rookienamelist += release[SideloaderRCLONE.GameNameIndex].ToString() + "\n";
|
||||
@@ -1319,7 +1336,6 @@ namespace AndroidSideloader
|
||||
{
|
||||
if (string.Equals(release[SideloaderRCLONE.PackageNameIndex], packagename))
|
||||
{
|
||||
|
||||
if (Properties.Settings.Default.QblindOn)
|
||||
{
|
||||
Game.BackColor = Color.FromArgb(0, 112, 138);
|
||||
@@ -1375,6 +1391,14 @@ namespace AndroidSideloader
|
||||
GameList.Add(Game);
|
||||
}
|
||||
|
||||
if (blacklistItems.Count == 0 || GameList.Count == 0 && !Properties.Settings.Default.nodevicemode)
|
||||
{
|
||||
//This means either the user does not have headset connected or the blacklist
|
||||
//did not load, so we are just going to skip everything
|
||||
errorOnList = true;
|
||||
FlexibleMessageBox.Show($"Rookie seems to have failed to load all resources. Please try restarting Rookie a few times.\nIf error still persists please disable any VPN or firewalls (rookie uses direct download so a VPN is not needed)\nIf this error still persists try a system reboot, reinstalling the program, and lastly posting the problem on telegram.", "Error loading blacklist or game list!");
|
||||
}
|
||||
newGamesList = installedGames.Except(rookieList).Except(blacklistItems).ToList();
|
||||
int topItemIndex = 0;
|
||||
try
|
||||
{
|
||||
@@ -1409,19 +1433,29 @@ namespace AndroidSideloader
|
||||
if (!errorOnList)
|
||||
{
|
||||
|
||||
|
||||
//This is for games that we already have on rookie and user has an update
|
||||
foreach (UpdateGameData gameData in gamesToAskForUpdate)
|
||||
{
|
||||
if (!updatesnotified)
|
||||
bool onupdatelist = false;
|
||||
string[] UpdatedApps = Properties.Settings.Default.SubmittedUpdates.Split('\n');
|
||||
foreach (string app in UpdatedApps)
|
||||
{
|
||||
if (app.Equals(gameData.Packagename))
|
||||
onupdatelist = true;
|
||||
}
|
||||
if (!updatesnotified && !onupdatelist)
|
||||
{
|
||||
DialogResult dialogResult = FlexibleMessageBox.Show($"You have a newer version of:\n\n{gameData.GameName}\n\nRSL can AUTOMATICALLY UPLOAD the clean files to a shared drive in the background,\nthis is the only way to keep the apps up to date for everyone.\n\nNOTE: Rookie will only extract the APK/OBB which contain NO personal information whatsoever.", "CONTRIBUTE CLEAN FILES?", MessageBoxButtons.YesNo);
|
||||
if (dialogResult == DialogResult.Yes)
|
||||
{
|
||||
Properties.Settings.Default.SubmittedUpdates += gameData.Packagename + ("\n");
|
||||
Properties.Settings.Default.Save();
|
||||
await extractAndPrepareGameToUploadAsync(gameData.GameName, gameData.Packagename, gameData.InstalledVersionInt);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//This is for WhiteListed Games, they will be asked for first, if we don't get many bogus prompts we can remove this entire duplicate section.
|
||||
foreach (string newGamesToUpload in newGamesToUploadList)
|
||||
{
|
||||
@@ -1431,16 +1465,16 @@ namespace AndroidSideloader
|
||||
string apppath = ADB.RunAdbCommandToString($"shell pm path {newGamesToUpload}").Output;
|
||||
apppath = Utilities.StringUtilities.RemoveEverythingBeforeFirst(apppath, "/");
|
||||
apppath = Utilities.StringUtilities.RemoveEverythingAfterFirst(apppath, "\r\n");
|
||||
if (File.Exists($"C:\\RSL\\2.8.2\\ADB\\base.apk"))
|
||||
File.Delete($"C:\\RSL\\2.8.2\\ADB\\base.apk");
|
||||
if (File.Exists($"C:\\RSL\\platform-tools\\base.apk"))
|
||||
File.Delete($"C:\\RSL\\platform-tools\\base.apk");
|
||||
ADB.RunAdbCommandToString($"pull \"{apppath}\"");
|
||||
string cmd = $"\"{Properties.Settings.Default.MainDir}\\adb\\aapt.exe\" dump badging \"C:\\RSL\\2.8.2\\ADB\\base.apk\" | findstr -i \"application-label\"";
|
||||
string workingpath = $"{Properties.Settings.Default.MainDir}\\adb\\aapt.exe";
|
||||
string cmd = $"\"C:\\RSL\\platform-tools\\aapt.exe\" dump badging \"C:\\RSL\\platform-tools\\base.apk\" | findstr -i \"application-label\"";
|
||||
string workingpath = "C:\\RSL\\platform-tools\\aapt.exe";
|
||||
string ReleaseName = ADB.RunCommandToString(cmd, workingpath).Output;
|
||||
ReleaseName = Utilities.StringUtilities.RemoveEverythingBeforeFirst(ReleaseName, "'");
|
||||
ReleaseName = Utilities.StringUtilities.RemoveEverythingAfterFirst(ReleaseName, "\r\n");
|
||||
ReleaseName = ReleaseName.Replace("'", "");
|
||||
File.Delete($"C:\\RSL\\2.8.2\\ADB\\base.apk");
|
||||
File.Delete($"C:\\RSL\\platform-tools\\base.apk");
|
||||
//end
|
||||
|
||||
string GameName = Sideloader.gameNameToSimpleName(RlsName);
|
||||
@@ -1472,25 +1506,38 @@ namespace AndroidSideloader
|
||||
string apppath = ADB.RunAdbCommandToString($"shell pm path {newGamesToUpload}").Output;
|
||||
apppath = Utilities.StringUtilities.RemoveEverythingBeforeFirst(apppath, "/");
|
||||
apppath = Utilities.StringUtilities.RemoveEverythingAfterFirst(apppath, "\r\n");
|
||||
if (File.Exists($"C:\\RSL\\2.8.2\\ADB\\base.apk"))
|
||||
File.Delete($"C:\\RSL\\2.8.2\\ADB\\base.apk");
|
||||
if (File.Exists($"C:\\RSL\\platform-tools\\base.apk"))
|
||||
File.Delete($"C:\\RSL\\platform-tools\\base.apk");
|
||||
ADB.RunAdbCommandToString($"pull \"{apppath}\"");
|
||||
string cmd = $"\"{Properties.Settings.Default.MainDir}\\adb\\aapt.exe\" dump badging \"C:\\RSL\\2.8.2\\ADB\\base.apk\" | findstr -i \"application-label\"";
|
||||
string workingpath = $"{Properties.Settings.Default.MainDir}\\adb\\aapt.exe";
|
||||
string cmd = $"\"C:\\RSL\\platform-tools\\aapt.exe\" dump badging \"C:\\RSL\\platform-tools\\base.apk\" | findstr -i \"application-label\"";
|
||||
string workingpath = $"C:\\RSL\\platform-tools\\aapt.exe";
|
||||
string ReleaseName = ADB.RunCommandToString(cmd, workingpath).Output;
|
||||
ReleaseName = Utilities.StringUtilities.RemoveEverythingBeforeFirst(ReleaseName, "'");
|
||||
ReleaseName = Utilities.StringUtilities.RemoveEverythingAfterFirst(ReleaseName, "\r\n");
|
||||
ReleaseName = ReleaseName.Replace("'", "");
|
||||
File.Delete($"C:\\RSL\\2.8.2\\ADB\\base.apk");
|
||||
File.Delete($"C:\\RSL\\platform-tools\\base.apk");
|
||||
if (ReleaseName.Contains("Microsoft Windows"))
|
||||
ReleaseName = newGamesToUpload;
|
||||
ReleaseName = RlsName;
|
||||
//end
|
||||
|
||||
bool onapplist = false;
|
||||
string GameName = Sideloader.gameNameToSimpleName(RlsName);
|
||||
Logger.Log(newGamesToUpload);
|
||||
if (!updatesnotified)
|
||||
string[] NewApp = Properties.Settings.Default.NonAppPackages.Split('\n');
|
||||
foreach (string app in NewApp)
|
||||
{
|
||||
DialogResult dialogResult = FlexibleMessageBox.Show($"You have a new game:\n\n{ReleaseName}\n\nRSL can AUTOMATICALLY UPLOAD the clean files to a shared drive in the background,\nthis is the only way to keep the apps up to date for everyone.\n\nNOTE: Rookie will only extract the APK/OBB which contain NO personal information whatsoever.", "CONTRIBUTE CLEAN FILES?", MessageBoxButtons.YesNo);
|
||||
if (app.Equals(newGamesToUpload))
|
||||
onapplist = true;
|
||||
}
|
||||
if (!updatesnotified && !onapplist)
|
||||
{
|
||||
DialogResult dialogResult = FlexibleMessageBox.Show($"New App detected:\n\n{ReleaseName}\n\nIs this a paid VR app?\n\n" +
|
||||
"If so Rookie will only extract the APK/OBB which contain NO personal info." +
|
||||
"\n\nPLEASE DON'T SHARE FREE/NON-VR APPS, INSTEAD PRESS \"NO\"!\n" +
|
||||
"ПОЖАЛУЙСТА, НЕ ЗАГРУЖАЙТЕ БЕСПЛАТНЫЕ ИЛИ НЕ_ВИАР ПРИЛОЖЕНИЯ, ПРОСТО НАЖМИТЕ \"НЕТ\"!\n" +
|
||||
"POR FAVOR, NO COMPARTAS APLICACIONES GRATUITAS/QUE NO SEAN DE RV, ¡PULSA \"NO\" EN SU LUGAR!\n" +
|
||||
"BITTE TEILT KEINE KOSTENLOSEN ODER APPS DIE NICHT IN VR SIND, DRÜCKT STATTDESSEN \"NEIN\"!\n" +
|
||||
"رجاءً لا تنشر برامج في ار مجانيه او برامج ليس لها صله بالفي ار ، عوضا عن ذلك اضغط لا\n" +
|
||||
"", "CONTRIBUTE PAID VR APP?", MessageBoxButtons.YesNoCancel);
|
||||
if (dialogResult == DialogResult.Yes)
|
||||
{
|
||||
string InstalledVersionCode;
|
||||
@@ -1498,7 +1545,12 @@ namespace AndroidSideloader
|
||||
InstalledVersionCode = Utilities.StringUtilities.RemoveEverythingBeforeFirst(InstalledVersionCode, "versionCode=");
|
||||
InstalledVersionCode = Utilities.StringUtilities.RemoveEverythingAfterFirst(InstalledVersionCode, " ");
|
||||
ulong installedVersionInt = UInt64.Parse(Utilities.StringUtilities.KeepOnlyNumbers(InstalledVersionCode));
|
||||
await extractAndPrepareGameToUploadAsync(GameName, newGamesToUpload, installedVersionInt);
|
||||
await extractAndPrepareGameToUploadAsync(ReleaseName, newGamesToUpload, installedVersionInt);
|
||||
}
|
||||
if (dialogResult == DialogResult.No)
|
||||
{
|
||||
Properties.Settings.Default.NonAppPackages += newGamesToUpload + ("\n");
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1515,19 +1567,20 @@ namespace AndroidSideloader
|
||||
|
||||
foreach (UploadGame game in gamesToUpload)
|
||||
{
|
||||
|
||||
Thread t3 = new Thread(() =>
|
||||
{
|
||||
string packagename = Sideloader.gameNameToPackageName(game.Uploadgamename);
|
||||
if (File.Exists($"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion}.zip"))
|
||||
File.Delete($"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion}.zip");
|
||||
string path = $"{Properties.Settings.Default.MainDir}\\7z.exe";
|
||||
string cmd = $"7z a \"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion}.zip\" .\\{game.Pckgcommand}\\*";
|
||||
string cmd = $"7z a \"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion} {game.Pckgcommand}.zip\" .\\{game.Pckgcommand}\\*";
|
||||
ChangeTitle("Zipping extracted application...");
|
||||
ADB.RunCommandToString(cmd, path);
|
||||
Directory.Delete($"{Properties.Settings.Default.MainDir}\\{game.Pckgcommand}", true);
|
||||
ChangeTitle("Uploading to drive, you may continue to use Rookie while it uploads.");
|
||||
RCLONE.runRcloneCommand(game.Uploadcommand);
|
||||
File.Delete($"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion}.zip");
|
||||
File.Delete($"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion} {game.Pckgcommand}.zip");
|
||||
|
||||
});
|
||||
t3.IsBackground = true;
|
||||
@@ -1546,6 +1599,15 @@ namespace AndroidSideloader
|
||||
ULGif.Enabled = false;
|
||||
ChangeTitle(" \n\n");
|
||||
}
|
||||
if (!String.IsNullOrEmpty(Properties.Settings.Default.NonAppPackages) && !Properties.Settings.Default.ListUpped)
|
||||
{
|
||||
Properties.Settings.Default.ListUpped = true;
|
||||
Properties.Settings.Default.Save();
|
||||
Random r = new Random();
|
||||
int x = r.Next(999999);
|
||||
File.WriteAllText($"{Properties.Settings.Default.MainDir}\\packages{x}.txt", Properties.Settings.Default.NonAppPackages);
|
||||
RCLONE.runRcloneCommand($"copy \"{Properties.Settings.Default.MainDir}\\packages{x}.txt\" RSL-debuglogs:InstalledGamesList");
|
||||
}
|
||||
}
|
||||
loaded = true;
|
||||
}
|
||||
@@ -1555,7 +1617,7 @@ namespace AndroidSideloader
|
||||
progressBar.Style = ProgressBarStyle.Marquee;
|
||||
Thread t1 = new Thread(() =>
|
||||
{
|
||||
Sideloader.getApk(GameName);
|
||||
Sideloader.getApk(packagename);
|
||||
});
|
||||
t1.IsBackground = true;
|
||||
t1.Start();
|
||||
@@ -1577,9 +1639,11 @@ namespace AndroidSideloader
|
||||
progressBar.Style = ProgressBarStyle.Continuous;
|
||||
UploadGame game = new UploadGame();
|
||||
game.Pckgcommand = packagename;
|
||||
game.Uploadcommand = $"copy \"{Properties.Settings.Default.MainDir}\\{GameName} v{installedVersionInt}.zip\" RSL-gameuploads:";
|
||||
game.Uploadversion = installedVersionInt;
|
||||
game.Uploadgamename = GameName;
|
||||
game.Uploadversion = installedVersionInt;
|
||||
game.Uploadcommand = $"copy \"{Properties.Settings.Default.MainDir}\\{game.Uploadgamename} v{game.Uploadversion} {game.Pckgcommand}.zip\" RSL-gameuploads:";
|
||||
|
||||
|
||||
gamesToUpload.Add(game);
|
||||
|
||||
ChangeTitle(" \n\n");
|
||||
@@ -1726,7 +1790,7 @@ without him none of this would be possible
|
||||
SideloaderRCLONE.initGames(currentRemote);
|
||||
listappsbtn();
|
||||
});
|
||||
t1.IsBackground = true;
|
||||
t1.IsBackground = false;
|
||||
t1.Start();
|
||||
while (t1.IsAlive)
|
||||
await Task.Delay(100);
|
||||
@@ -2016,13 +2080,13 @@ without him none of this would be possible
|
||||
}
|
||||
|
||||
Debug.WriteLine(wrDelimiter);
|
||||
if (Directory.Exists($"{Environment.CurrentDirectory}\\{gameName}\\{packagename}"))
|
||||
if (Directory.Exists($"{Properties.Settings.Default.MainDir}\\{gameName}\\{packagename}"))
|
||||
{
|
||||
Thread obbThread = new Thread(() =>
|
||||
{
|
||||
|
||||
ChangeTitle($"Copying {packagename} obb to device...");
|
||||
output += ADB.RunAdbCommandToString($"push \"{Environment.CurrentDirectory}\\{gameName}\\{packagename}\" \"/sdcard/Android/obb\"");
|
||||
output += ADB.RunAdbCommandToString($"push \"{Properties.Settings.Default.MainDir}\\{gameName}\\{packagename}\" \"/sdcard/Android/obb\"");
|
||||
Program.form.ChangeTitle("");
|
||||
});
|
||||
obbThread.IsBackground = true;
|
||||
@@ -2078,7 +2142,11 @@ without him none of this would be possible
|
||||
{
|
||||
if (!Properties.Settings.Default.AutoReinstall)
|
||||
{
|
||||
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);
|
||||
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.Cancel)
|
||||
{
|
||||
return;
|
||||
|
||||
10
Properties/Resources.Designer.cs
generated
10
Properties/Resources.Designer.cs
generated
@@ -110,6 +110,16 @@ namespace AndroidSideloader.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
public static System.Drawing.Bitmap gametoupload {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("gametoupload", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
||||
@@ -118,23 +118,26 @@
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="SearchGlass" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SearchGlass.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="orangekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\orangekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="greenkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\greenkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="battery1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\battery11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="battery" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\battery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="battery11" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\battery1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="SearchGlass" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\SearchGlass.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="ajax-loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ajax-loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="battery1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\battery11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="bluekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\bluekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -142,7 +145,7 @@
|
||||
<data name="redkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\redkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ajax-loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ajax-loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="gametoupload" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\gametoupload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
47
Properties/Settings.Designer.cs
generated
47
Properties/Settings.Designer.cs
generated
@@ -669,5 +669,52 @@ namespace AndroidSideloader.Properties {
|
||||
this["AutoReinstall"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("")]
|
||||
public string NonAppPackages {
|
||||
get {
|
||||
return ((string)(this["NonAppPackages"]));
|
||||
}
|
||||
set {
|
||||
this["NonAppPackages"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
public global::System.DateTime LastLaunch {
|
||||
get {
|
||||
return ((global::System.DateTime)(this["LastLaunch"]));
|
||||
}
|
||||
set {
|
||||
this["LastLaunch"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("")]
|
||||
public string SubmittedUpdates {
|
||||
get {
|
||||
return ((string)(this["SubmittedUpdates"]));
|
||||
}
|
||||
set {
|
||||
this["SubmittedUpdates"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("False")]
|
||||
public bool ListUpped {
|
||||
get {
|
||||
return ((bool)(this["ListUpped"]));
|
||||
}
|
||||
set {
|
||||
this["ListUpped"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,5 +164,17 @@
|
||||
<Setting Name="AutoReinstall" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="NonAppPackages" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="LastLaunch" Type="System.DateTime" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="SubmittedUpdates" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="ListUpped" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
BIN
Resources/gametoupload.png
Normal file
BIN
Resources/gametoupload.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 827 B |
@@ -53,14 +53,14 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
|
||||
ADB.WakeDevice();
|
||||
ProcessOutput output = new ProcessOutput();
|
||||
var commands = File.ReadAllLines(path);
|
||||
string currfolder = Path.GetDirectoryName(path);
|
||||
string[] zipz = Directory.GetFiles(currfolder, "*.7z", SearchOption.AllDirectories);
|
||||
foreach (string zip in zipz)
|
||||
{
|
||||
Utilities.Zip.ExtractFile($"{zip}", currfolder);
|
||||
}
|
||||
foreach (string cmd in commands)
|
||||
{
|
||||
if (cmd.Contains("7z.exe"))
|
||||
{
|
||||
Program.form.ChangeTitle($"Running {cmd}");
|
||||
Logger.Log($"Logging command: {cmd} from file: {path}");
|
||||
ADB.RunCommandToString(cmd, path);
|
||||
}
|
||||
if (cmd.StartsWith("adb"))
|
||||
{
|
||||
string replacement = "";
|
||||
@@ -196,9 +196,9 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
|
||||
{
|
||||
foreach (string[] game in SideloaderRCLONE.games)
|
||||
{
|
||||
if (gameName.Contains(game[SideloaderRCLONE.GameNameIndex]))
|
||||
if (gameName.Equals(game[SideloaderRCLONE.GameNameIndex]))
|
||||
return game[SideloaderRCLONE.PackageNameIndex];
|
||||
if (gameName.Contains(game[SideloaderRCLONE.ReleaseNameIndex]))
|
||||
if (gameName.Equals(game[SideloaderRCLONE.ReleaseNameIndex]))
|
||||
return game[SideloaderRCLONE.PackageNameIndex];
|
||||
}
|
||||
return gameName;
|
||||
@@ -208,7 +208,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
|
||||
{
|
||||
foreach (string[] game in SideloaderRCLONE.games)
|
||||
{
|
||||
if (gameName.Contains(game[SideloaderRCLONE.PackageNameIndex]))
|
||||
if (gameName.Equals(game[SideloaderRCLONE.PackageNameIndex]))
|
||||
return game[SideloaderRCLONE.ReleaseNameIndex];
|
||||
}
|
||||
return gameName;
|
||||
@@ -218,9 +218,9 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
|
||||
{
|
||||
foreach (string[] game in SideloaderRCLONE.games)
|
||||
{
|
||||
if (gameName.Contains(game[SideloaderRCLONE.GameNameIndex]))
|
||||
if (gameName.Equals(game[SideloaderRCLONE.GameNameIndex]))
|
||||
return game[SideloaderRCLONE.GameNameIndex];
|
||||
if (gameName.Contains(game[SideloaderRCLONE.ReleaseNameIndex]))
|
||||
if (gameName.Equals(game[SideloaderRCLONE.ReleaseNameIndex]))
|
||||
return game[SideloaderRCLONE.GameNameIndex];
|
||||
}
|
||||
return gameName;
|
||||
@@ -247,12 +247,17 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
|
||||
{
|
||||
if (!File.Exists("Sideloader Launcher.exe"))
|
||||
client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/Sideloader%20Launcher.exe", "Sideloader Launcher.exe");
|
||||
if (!File.Exists($"{Properties.Settings.Default.MainDir}\\adb\\aug2021.txt") || !File.Exists("C:\\RSL\\2.8.2\\ADB\\aug2021.txt")) //if adb is not updated, download and auto extract
|
||||
if (!File.Exists("C:\\RSL\\platform-tools\\aug2021.txt")) //if adb is not updated, download and auto extract
|
||||
{
|
||||
client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/adb.7z", "adb.7z");
|
||||
Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\adb.7z", Environment.CurrentDirectory);
|
||||
Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\adb.7z", "C:\\RSL\\2.8.2\\");
|
||||
File.Delete("adb.7z");
|
||||
if (Directory.Exists($"C:\\RSL"))
|
||||
Directory.Delete("C:\\RSL", 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");
|
||||
client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/adb2.zip", "adb2.zip");
|
||||
Utilities.Zip.ExtractFile(Environment.CurrentDirectory + "\\adb2.zip", "C:\\RSL\\platform-tools");
|
||||
File.Delete("adb2.zip");
|
||||
}
|
||||
|
||||
if (!Directory.Exists(Environment.CurrentDirectory + "\\rclone"))
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace AndroidSideloader
|
||||
private static string RawGitHubUrl;
|
||||
private static string GitHubUrl;
|
||||
|
||||
static readonly public string LocalVersion = "2.9.2";
|
||||
static readonly public string LocalVersion = "2.9.7";
|
||||
public static string currentVersion = string.Empty;
|
||||
public static string changelog = string.Empty;
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ namespace AndroidSideloader.Utilities
|
||||
{
|
||||
public static void ExtractFile(string sourceArchive, string destination)
|
||||
{
|
||||
if (!File.Exists(Environment.CurrentDirectory + "\\7z.exe"))
|
||||
if (!File.Exists(Environment.CurrentDirectory + "\\7z.exe") || !File.Exists(Environment.CurrentDirectory + "\\7z.dll"))
|
||||
{
|
||||
WebClient client = new WebClient();
|
||||
client.DownloadFile("https://github.com/nerdunit/androidsideloader/raw/master/7z.exe", "7z.exe");
|
||||
|
||||
@@ -1,28 +1,4 @@
|
||||
RSL 2.9.2
|
||||
RSL 2.9.7
|
||||
|
||||
+ Added option in settings menu
|
||||
to automatically reinstall apps
|
||||
when installs fail due to previous
|
||||
version clashing with update.
|
||||
|
||||
NOTE: If your USB or wireless ADB
|
||||
connection is extremely slow this
|
||||
setting can cause larger APK installs
|
||||
to fail in rare cases.
|
||||
|
||||
= Fixed auto reinstall for signature
|
||||
mismatch when if ADB reports error
|
||||
properly (thanks to ADB update),
|
||||
this will lead to faster reinstalls
|
||||
in general when there are issues.
|
||||
|
||||
= Fixed crash that would occur when
|
||||
closing Rookie.
|
||||
|
||||
= Added check to see if AAPT was
|
||||
sucessful in retrieving mew game
|
||||
name from APK, if not RSL will just
|
||||
call the name by its package name
|
||||
instead.
|
||||
|
||||
HFP
|
||||
= Fixed bug that caused error message to appear
|
||||
when no device is connected to PC.
|
||||
Reference in New Issue
Block a user