Skip to content

Commit 6ed4bea

Browse files
committed
feat: Update deps
1 parent 0c33abc commit 6ed4bea

10 files changed

Lines changed: 197 additions & 333 deletions

File tree

Nickvision.Application.GNOME/Nickvision.Application.GNOME.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="GirCore.Adw-1" Version="0.7.0" />
17-
<PackageReference Include="Nickvision.Desktop.GNOME" Version="2026.4.1" />
17+
<PackageReference Include="Nickvision.Desktop.GNOME" Version="2026.4.2" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\Nickvision.Application.Shared\Nickvision.Application.Shared.csproj" />

Nickvision.Application.GNOME/Views/MainWindow.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ private MainWindow(IServiceProvider serviceProvider, Adw.Application application
8181
App_AppNotificationSent(sender, e);
8282
return false;
8383
});
84-
eventsService.DatabasePasswordRequired += App_DatabasePasswordRequired;
8584
eventsService.FolderChanged += App_FolderChanged;
8685
// Drop target
8786
var dropTarget = Gtk.DropTarget.New(Gio.FileHelper.GetGType(), Gdk.DragAction.Copy);
@@ -194,33 +193,6 @@ private void App_AppNotificationSent(object? sender, AppNotificationSentEventArg
194193
_toastOverlay!.AddToast(toast);
195194
}
196195

197-
private async void App_DatabasePasswordRequired(object? sender, PasswordRequiredEventArgs e)
198-
{
199-
var password = string.Empty;
200-
var passwordEntryRow = Adw.PasswordEntryRow.New();
201-
passwordEntryRow.Title = _translationService._("Password");
202-
var preferencesGroup = Adw.PreferencesGroup.New();
203-
preferencesGroup.Add(passwordEntryRow);
204-
var dialog = Adw.MessageDialog.New(this, _translationService._("Password Required"), _translationService._("This app stores data in an encrypted database. As the system credential manager (secret service) is not available, please provide a password to use to encrypt the database.\n\nIf you've already provided a password, please provide it again to unlock the database."));
205-
dialog.AddResponse("submit", _translationService._("Submit"));
206-
dialog.SetResponseAppearance("submit", Adw.ResponseAppearance.Suggested);
207-
dialog.SetDefaultResponse("submit");
208-
dialog.SetCloseResponse("submit");
209-
dialog.SetExtraChild(preferencesGroup);
210-
dialog.OnResponse += (_, args) =>
211-
{
212-
if (args.Response == "submit")
213-
{
214-
password = passwordEntryRow.Text_ ?? string.Empty;
215-
}
216-
};
217-
while (string.IsNullOrEmpty(password))
218-
{
219-
dialog.Present();
220-
await Task.Delay(100);
221-
}
222-
}
223-
224196
private void App_FolderChanged(object? sender, FolderChangedEventArgs e)
225197
{
226198
_windowTitle!.Subtitle = e.IsOpen ? e.Path : string.Empty;

Nickvision.Application.Shared/Nickvision.Application.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Nickvision.Desktop" Version="2026.4.4" />
15+
<PackageReference Include="Nickvision.Desktop" Version="2026.4.5" />
1616
<PackageReference Include="NReco.Logging.File" Version="1.3.1" />
1717
</ItemGroup>
1818

Nickvision.Application.Shared/Services/EventsService.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ public event EventHandler<ConfigurationSavedEventArgs>? ConfigurationSaved
3434
remove => _configurationService.Saved -= value;
3535
}
3636

37-
public event EventHandler<PasswordRequiredEventArgs>? DatabasePasswordRequired
38-
{
39-
add => _databaseService.PasswordRequired += value;
40-
41-
remove => _databaseService.PasswordRequired -= value;
42-
}
43-
4437
public event EventHandler<FolderChangedEventArgs> FolderChanged
4538
{
4639
add => _folderService.Changed += value;

Nickvision.Application.Shared/Services/IEventsService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ public interface IEventsService
99
{
1010
event EventHandler<AppNotificationSentEventArgs>? AppNotificationSent;
1111
event EventHandler<ConfigurationSavedEventArgs>? ConfigurationSaved;
12-
event EventHandler<PasswordRequiredEventArgs>? DatabasePasswordRequired;
1312
event EventHandler<FolderChangedEventArgs> FolderChanged;
1413
}

Nickvision.Application.WinUI/Nickvision.Application.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
3737
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1721" />
3838
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260317003" />
39-
<PackageReference Include="Nickvision.Desktop.WinUI" Version="2026.4.3" />
39+
<PackageReference Include="Nickvision.Desktop.WinUI" Version="2026.4.4" />
4040
</ItemGroup>
4141
<ItemGroup>
4242
<ProjectReference Include="..\Nickvision.Application.Shared\Nickvision.Application.Shared.csproj" />

Nickvision.Application.WinUI/Views/MainWindow.xaml.cs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public MainWindow(IServiceProvider serviceProvider, MainWindowController control
7070
AppWindow.Closing += Window_Closing;
7171
eventsService.AppNotificationSent += (sender, args) => DispatcherQueue.TryEnqueue(() => App_AppNotificationSent(sender, args));
7272
eventsService.ConfigurationSaved += App_ConfigurationSaved;
73-
eventsService.DatabasePasswordRequired += App_DatabasePasswordRequired;
7473
eventsService.FolderChanged += App_FolderChanged;
7574
// Translations
7675
AppWindow.Title = _appInfo.ShortName;
@@ -179,40 +178,6 @@ private void App_ConfigurationSaved(object? sender, ConfigurationSavedEventArgs
179178
}
180179
}
181180

182-
private async void App_DatabasePasswordRequired(object? sender, PasswordRequiredEventArgs args)
183-
{
184-
var passwordBox = new PasswordBox()
185-
{
186-
PlaceholderText = _translationService._("Enter password here")
187-
};
188-
var stackPanel = new StackPanel()
189-
{
190-
Orientation = Orientation.Vertical,
191-
Spacing = 12
192-
};
193-
stackPanel.Children.Add(new TextBlock()
194-
{
195-
Text = _translationService._("This app stores data in an encrypted database. As the system credential manager (secret service) is not available, please provide a password to use to encrypt the database.\n\nIf you've already provided a password, please provide it again to unlock the database."),
196-
TextWrapping = TextWrapping.WrapWholeWords
197-
});
198-
stackPanel.Children.Add(passwordBox);
199-
var contentDialog = new ContentDialog()
200-
{
201-
Title = _translationService._("Password Required"),
202-
Content = stackPanel,
203-
PrimaryButtonText = _translationService._("Submit"),
204-
DefaultButton = ContentDialogButton.Primary
205-
};
206-
while (string.IsNullOrEmpty(args.Password))
207-
{
208-
var res = await contentDialog.ShowAsync();
209-
if (res == ContentDialogResult.Primary)
210-
{
211-
args.Password = passwordBox.Password;
212-
}
213-
}
214-
}
215-
216181
private void App_FolderChanged(object? sender, FolderChangedEventArgs args)
217182
{
218183
TitleBar.IsBackButtonVisible = false;

0 commit comments

Comments
 (0)