robojerk/Libation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix (#548)

Browse source
This commit is contained in:
MBucari 2023-03-25 16:33:00 -06:00
parent fc6f494f0d
commit 397a516dc1
11 changed files with 60 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs
View file

@ -25,7 +25,7 @@ namespace LibationAvalonia.Dialogs.Login
{
var dialog = new LoginChoiceEagerDialog(_account);
if (await dialog.ShowDialogAsync() is not DialogResult.OK)
if (await dialog.ShowDialogAsync() is not DialogResult.OK || string.IsNullOrWhiteSpace(dialog.Password))
return null;
switch (dialog.LoginMethod)

12
Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs
View file

@ -4,6 +4,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using System.Linq;
using System.Threading.Tasks;
namespace LibationAvalonia.Dialogs.Login
{
@ -31,6 +32,17 @@ namespace LibationAvalonia.Dialogs.Login
DataContext = this;
}
protected override async Task SaveAndCloseAsync()
{
if (string.IsNullOrWhiteSpace(Password))
{
await MessageBox.Show(this, "Please enter your password");
return;
}
await base.SaveAndCloseAsync();
}
public async void ExternalLoginLink_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
{
LoginMethod = LoginMethod.External;

4
Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs
View file

@ -427,6 +427,10 @@ namespace LibationAvalonia.ViewModels
foreach (var r in removable)
r.Remove = true;
}
catch (OperationCanceledException)
{
Serilog.Log.Information("Audible login attempt cancelled by user");
}
catch (Exception ex)
{
await MessageBox.ShowAdminAlert(

4
Source/LibationAvalonia/Views/MainWindow.ScanAuto.cs
View file

@ -32,6 +32,10 @@ namespace LibationAvalonia.Views
{
await LibraryCommands.ImportAccountAsync(Dialogs.Login.AvaloniaLoginChoiceEager.ApiExtendedFunc, accounts);
}
catch (OperationCanceledException)
{
Serilog.Log.Information("Audible login attempt cancelled by user");
}
catch (Exception ex)
{
Serilog.Log.Logger.Error(ex, "Error invoking auto-scan");

4
Source/LibationAvalonia/Views/MainWindow.ScanManual.cs
View file

@ -69,6 +69,10 @@ namespace LibationAvalonia.Views
if (Configuration.Instance.ShowImportedStats && newAdded > 0)
await MessageBox.Show($"Total processed: {totalProcessed}\r\nNew: {newAdded}");
}
catch(OperationCanceledException)
{
Serilog.Log.Information("Audible login attempt cancelled by user");
}
catch (Exception ex)
{
await MessageBox.ShowAdminAlert(