haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6388 from duplicati/feature/apply-secret-provider-trayicon

Browse Source 
Apply Secret Provider to TrayIcon
This commit is contained in:
Kenneth Skovhede
2025-07-03 11:07:06 +02:00
committed by GitHub
parent 57d85fcad5 19ac279939
commit d1d1bb8b4c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs
+8 -4
View File
@@ -117,6 +117,10 @@ namespace Duplicati.GUI.TrayIcon
return 0;
}
// Apply secret provider, if any, so password etc can be retrieved
Library.Main.SecretProviderHelper.ApplySecretProviderAsync([], [], options, TempFolder.SystemTempPath, null, CancellationToken.None)
.Await();
options.TryGetValue(BROWSER_COMMAND_OPTION, out _browser_command);
HostedInstanceKeeper hosted = null;
@@ -248,7 +252,7 @@ No password provided, unable to connect to server, exiting");
try
{
ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault;
using (Connection = new HttpServerConnection(hosted.applicationSettings, serverURL, password, passwordSource, disableTrayIconLogin, acceptedHostCertificate, options))
{
// Make sure we have the latest status, but don't care if it fails
@@ -288,11 +292,11 @@ No password provided, unable to connect to server, exiting");
reSpawn = 100;
tk.InvokeExit();
};
Connection.ConnectionClosed = shutdownEvent;
if (hosted != null)
hosted.InstanceShutdown = shutdownEvent;
tk.Init(_args);
// If the tray-icon quits, stop the server
@@ -306,7 +310,7 @@ No password provided, unable to connect to server, exiting");
}
}
}
catch (HttpRequestException ex)
{