Skip to content
Permalink
Browse files

Merge pull request #2187 from molnard/lucaspwbox

Remove Chinese character masking from PasswordBox
  • Loading branch information...
nopara73 committed Sep 9, 2019
2 parents 0ce1538 + 803699c commit c13ae81790f971b7ff81eeeb6752e9c031251739
Showing with 283 additions and 661 deletions.
  1. +1 −1 WalletWasabi.Gui/App.xaml
  2. +1 −1 WalletWasabi.Gui/CommandLine/Daemon.cs
  3. +3 −3 WalletWasabi.Gui/Controls/LockScreen/PinLockScreen.xaml
  4. +2 −2 WalletWasabi.Gui/Controls/LockScreen/PinLockScreen.xaml.cs
  5. +0 −447 WalletWasabi.Gui/Controls/NoparaPasswordBox.cs
  6. +0 −95 WalletWasabi.Gui/Controls/NoparaPasswordBox.xaml
  7. +62 −0 WalletWasabi.Gui/Controls/TogglePasswordBox.cs
  8. +107 −0 WalletWasabi.Gui/Controls/TogglePasswordBox.xaml
  9. +4 −4 WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabView.xaml
  10. +12 −22 WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
  11. +2 −2 WalletWasabi.Gui/Controls/WalletExplorer/PinPadView.xaml
  12. +5 −5 WalletWasabi.Gui/Controls/WalletExplorer/SendTabView.xaml
  13. +3 −0 WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
  14. +4 −4 WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoView.xaml
  15. +4 −19 WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
  16. +1 −1 WalletWasabi.Gui/Tabs/SettingsView.xaml
  17. +2 −2 WalletWasabi.Gui/Tabs/WalletManager/GenerateWalletView.xaml
  18. +28 −3 WalletWasabi.Gui/Tabs/WalletManager/GenerateWalletViewModel.cs
  19. +6 −6 WalletWasabi.Gui/Tabs/WalletManager/LoadWalletView.xaml
  20. +4 −20 WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
  21. +6 −2 WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletView.xaml
  22. +4 −18 WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletViewModel.cs
  23. +3 −3 WalletWasabi.Tests/UnitTests/PasswordTests.cs
  24. +19 −1 WalletWasabi/Helpers/PasswordHelper.cs
@@ -19,7 +19,7 @@
<StyleInclude Source="resm:WalletWasabi.Gui.Controls.GroupBox.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Styles.Styles.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Icons.Icons.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Controls.NoparaPasswordBox.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Controls.TogglePasswordBox.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Controls.MultiTextBox.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Controls.BusyIndicator.xaml?assembly=WalletWasabi.Gui" />
<StyleInclude Source="resm:WalletWasabi.Gui.Controls.EditableTextBlock.xaml?assembly=WalletWasabi.Gui" />
@@ -58,7 +58,7 @@ internal async Task RunAsync(string walletName, bool mixAll, bool keepMixAlive)
}
if (PasswordHelper.IsTrimable(password, out password))
{
Console.WriteLine(PasswordHelper.TrimmedMessage);
Console.WriteLine(PasswordHelper.TrimWarnMessage);
}
}
while (!PasswordHelper.TryPassword(keyManager, password, out compatibilityPassword));
@@ -1,7 +1,7 @@
<lockscreen:PinLockScreen xmlns="https://github.com/avaloniaui"
<lockscreen:PinLockScreen xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.LockScreen.PinLockScreen"
IsLocked="{Binding IsLocked}">
<lockscreen:PinLockScreen.Styles>
@@ -34,7 +34,7 @@
<Grid Classes="Shade" Background="{DynamicResource ThemeBackgroundBrush}">
<controls:GroupBox VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.FontSize="25" Padding="20" Margin="10">
<DockPanel LastChildFill="True">
<controls:NoparaPasswordBox x:Name="InputField" Password="{Binding PinInput}" Width="300" DockPanel.Dock="Top" Margin="4 0 4 20" Watermark="PIN" UseFloatingWatermark="True" />
<controls:TogglePasswordBox x:Name="InputField" Text="{Binding PinInput}" Width="300" DockPanel.Dock="Top" Margin="4 0 4 20" Watermark="PIN" />
<Grid DockPanel.Dock="Bottom">
<TextBlock Text="Wrong PIN!" Margin="0,12,0,0" VerticalAlignment="Center" FontSize="20" Classes="warningMessage" IsVisible="{Binding WarningMessageVisible}" />
</Grid>
@@ -28,7 +28,7 @@ public PinLockScreen() : base()
{
InitializeComponent();

var inputField = this.FindControl<NoparaPasswordBox>("InputField");
var inputField = this.FindControl<TogglePasswordBox>("InputField");

this.WhenAnyValue(x => x.IsLocked)
.Where(x => x)
@@ -53,7 +53,7 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
{
var inputField = this.FindControl<NoparaPasswordBox>("InputField");
var inputField = this.FindControl<TogglePasswordBox>("InputField");
inputField.Focus();
});
}

0 comments on commit c13ae81

Please sign in to comment.
You can’t perform that action at this time.