Handle missing CurrentCulture

This commit is contained in:
Natsumi
2025-01-31 16:37:29 +13:00
parent e426a0ceef
commit a7c400f9b7

View File

@@ -14,11 +14,11 @@ namespace VRCX
{
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
private static readonly MD5 _hasher = MD5.Create();
public void Init()
{
}
public string MD5File(string blob)
{
var fileData = Convert.FromBase64CharArray(blob.ToCharArray(), 0, blob.Length);
@@ -26,13 +26,13 @@ namespace VRCX
var md5Hash = md5.ComputeHash(fileData);
return Convert.ToBase64String(md5Hash);
}
public int GetColourFromUserID(string userId)
{
var hash = _hasher.ComputeHash(Encoding.UTF8.GetBytes(userId));
return (hash[3] << 8) | hash[4];
}
public string SignFile(string blob)
{
var fileData = Convert.FromBase64String(blob);
@@ -42,13 +42,13 @@ namespace VRCX
var sigBytes = memoryStream.ToArray();
return Convert.ToBase64String(sigBytes);
}
public string FileLength(string blob)
{
var fileData = Convert.FromBase64String(blob);
return fileData.Length.ToString();
}
public void OpenLink(string url)
{
if (url.StartsWith("http://") ||
@@ -60,7 +60,7 @@ namespace VRCX
});
}
}
public void IPCAnnounceStart()
{
IPCServer.Send(new IPCPacket
@@ -69,7 +69,7 @@ namespace VRCX
MsgType = "VRCXLaunch"
});
}
public void SendIpc(string type, string data)
{
IPCServer.Send(new IPCPacket
@@ -79,7 +79,7 @@ namespace VRCX
Data = data
});
}
public string CustomCssPath()
{
var output = string.Empty;
@@ -100,7 +100,11 @@ namespace VRCX
public string CurrentCulture()
{
return CultureInfo.CurrentCulture.ToString();
var culture = CultureInfo.CurrentCulture.ToString();
if (string.IsNullOrEmpty(culture))
culture = "en-US";
return culture;
}
public string CurrentLanguage()
@@ -128,13 +132,13 @@ namespace VRCX
return output;
}
public void SetAppLauncherSettings(bool enabled, bool killOnExit)
{
AutoAppLaunchManager.Instance.Enabled = enabled;
AutoAppLaunchManager.Instance.KillChildrenOnExit = killOnExit;
}
public string GetFileBase64(string path)
{
if (File.Exists(path))