bybrooklyn/rookie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'beta/RSL-2.28' of https://github.com/VRPirates/rookie into beta/RSL-2.28

Browse Source
This commit is contained in:
fenopy
2024-02-28 11:54:41 -06:00
parent 1dddf5c41a 018c30b73f
commit 7cfee896b1
10 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
App.config
View File

@@ -176,6 +176,9 @@
<setting name="virtualFilesystemCompatibility" serializeAs="String">
<value>False</value>
</setting>
<setting name="UpdateSettings" serializeAs="String">
<value>True</value>
</setting>
</AndroidSideloader.Properties.Settings>
<AndroidADB.Sideloader.Properties.Settings>
<setting name="checkForUpdates" serializeAs="String">

13
MainForm.cs
View File

@@ -2055,9 +2055,18 @@ namespace AndroidSideloader
Program.form.changeTitle("Uploading to server, you can continue to use Rookie while it uploads in the background.");
Program.form.ULLabel.Visible = true;
isworking = true;
string deviceCodeName = ADB.RunAdbCommandToString("shell getprop ro.product.device").Output.ToLower();
string deviceCodeName = ADB.RunAdbCommandToString("shell getprop ro.product.device").Output.ToLower().Trim();
string codeNamesLink = "https://raw.githubusercontent.com/VRPirates/rookie/master/codenames";
bool codenameExists = HttpClient.GetStringAsync(codeNamesLink).Result.Contains(deviceCodeName);
bool codenameExists = false;
try
{
codenameExists = HttpClient.GetStringAsync(codeNamesLink).Result.Contains(deviceCodeName);
}
catch
{
_ = Logger.Log("Unable to download Codenames file.");
FlexibleMessageBox.Show(Program.form, $"Error downloading Codenames File from Github", "Verification Error", MessageBoxButtons.OK);
}
if (codenameExists)
{

7
Program.cs
View File

@@ -19,7 +19,12 @@ namespace AndroidSideloader
currentDomain.UnhandledException += new UnhandledExceptionEventHandler(CrashHandler);
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
if (AndroidSideloader.Properties.Settings.Default.UpdateSettings)
{
AndroidSideloader.Properties.Settings.Default.Upgrade();
AndroidSideloader.Properties.Settings.Default.UpdateSettings = false;
AndroidSideloader.Properties.Settings.Default.Save();
}
form = new MainForm();
Application.Run(form);
//form.Show();

19
Properties/Settings.Designer.cs generated
View File

@@ -12,7 +12,7 @@ namespace AndroidSideloader.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -203,8 +203,6 @@ namespace AndroidSideloader.Properties {
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
@@ -216,7 +214,6 @@ namespace AndroidSideloader.Properties {
this["MainDir"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -349,7 +346,7 @@ namespace AndroidSideloader.Properties {
this["CurrentCrashName"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -684,5 +681,17 @@ namespace AndroidSideloader.Properties {
this["virtualFilesystemCompatibility"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool UpdateSettings {
get {
return ((bool)(this["UpdateSettings"]));
}
set {
this["UpdateSettings"] = value;
}
}
}
}

3
Properties/Settings.settings
View File

@@ -167,5 +167,8 @@
<Setting Name="virtualFilesystemCompatibility" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>

2
Updater.cs
View File

@@ -13,7 +13,7 @@ namespace AndroidSideloader
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.27.1";
public static readonly string LocalVersion = "2.27.2";
public static string currentVersion = string.Empty;
public static string changelog = string.Empty;

2
Utilities/Zip.cs
View File

@@ -109,7 +109,7 @@ namespace AndroidSideloader.Utilities
}));
}
_ = Logger.Log(error, LogLevel.ERROR);
extractionError = $"Extracting failed, status code {x.ExitCode}";
extractionError = $"Extracting failed: {error}"; // Store the error message directly
return;
}
};

3
changelog.txt
View File

@@ -1,7 +1,8 @@
RSL 2.27
RSL 2.27.2
- Feature: Searchbar can now also search release names
- Feature: Rookie will now download 64 bit 7zip binaries for faster extractions (when possible)
- Fix: 7zip error handler
- Fix: Crash when downloading without enough space
- Fix: Rookie will no longer deny game donations.
- Chore: Cleanup code

4
codenames
View File

@@ -1,4 +1,6 @@
monterey
hollywood
seacliff
eureka
eureka
panther
quest

2
version
View File

@@ -1 +1 @@
2.27.1
2.27.2