third-party-mirrors/Discord-History-Tracker
1
0
Fork 0
mirror of https://github.com/chylex/Discord-History-Tracker.git synced 2025-04-14 15:47:14 +03:00
Code Issues Projects Releases Wiki Activity

Update uses of Avalonia APIs & safeguard clipboard code

Browse Source
This commit is contained in:
chylex 2022-02-27 15:29:49 +01:00
parent 20aac4c47a
commit ebfe972a98
No known key found for this signature in database
GPG Key ID: 4DE42C8F19A80548
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Desktop/Common/NumberValueConverter.cs
View File

@ -4,11 +4,11 @@ using Avalonia.Data.Converters;
namespace DHT.Desktop.Common {
sealed class NumberValueConverter : IValueConverter {
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
return string.Format(Program.Culture, "{0:n0}", value);
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
throw new NotSupportedException();
}
}

4
app/Desktop/Main/Pages/TrackingPage.axaml.cs
View File

@ -24,9 +24,7 @@ namespace DHT.Desktop.Main.Pages {
var originalText = button.Content;
button.MinWidth = button.Bounds.Width;
await model.OnClickCopyTrackingScript();
if (!isCopyingScript) {
if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
isCopyingScript = true;
button.Content = "Script Copied!";

22
app/Desktop/Main/Pages/TrackingPageModel.cs
View File

@ -67,7 +67,7 @@ namespace DHT.Desktop.Main.Pages {
if (!IsToggleAppDevToolsButtonEnabled) {
return "Unavailable";
}
return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
}
}
@ -149,7 +149,7 @@ namespace DHT.Desktop.Main.Pages {
}
}
public async Task OnClickCopyTrackingScript() {
public async Task<bool> OnClickCopyTrackingScript() {
string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerPort + ";")
.Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerToken))
@ -157,7 +157,19 @@ namespace DHT.Desktop.Main.Pages {
.Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
.Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"));
await Application.Current.Clipboard.SetTextAsync(script);
var clipboard = Application.Current?.Clipboard;
if (clipboard == null) {
await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
return false;
}
try {
await clipboard.SetTextAsync(script);
return true;
} catch {
await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
return false;
}
}
public void OnClickRandomizeToken() {
@ -179,7 +191,7 @@ namespace DHT.Desktop.Main.Pages {
public async void OnClickToggleAppDevTools() {
const string DialogTitle = "Discord App Settings File";
bool oldState = AreDevToolsEnabled;
bool newState = !oldState;
@ -188,7 +200,7 @@ namespace DHT.Desktop.Main.Pages {
AreDevToolsEnabled = newState;
await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
break;
case SettingsJsonResult.AlreadySet:
await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
AreDevToolsEnabled = newState;