Merge pull request #2357 from win-acme/2.2.4

2.2.3.1
win-acme · Apr 15, 2023 · 0ef4d70 · 0ef4d70
2 parents 25d0bbd + 87462fb
commit 0ef4d70
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/ACMESharpCore b/src/ACMESharpCore
diff --git a/src/main.lib/Clients/Acme/AcmeClient.cs b/src/main.lib/Clients/Acme/AcmeClient.cs
@@ -283,7 +283,10 @@ internal async Task UpdateRenewalInfo(ICertificateInfo certificate)
             {
                 return;
             }
-            _ = await _client.Retry(() => _client.UpdateRenewalInfo(CertificateId(certificate)), _log);
+            _ = await _client.Retry<object?>(async () => {
+                await _client.UpdateRenewalInfo(CertificateId(certificate));
+                return null; // we need to return something to make Retry<T>() happy
+            }, _log);
         }
 
         private static byte[] CertificateId(ICertificateInfo certificate)

diff --git a/src/main.lib/RenewalManager.cs b/src/main.lib/RenewalManager.cs
@@ -143,7 +143,7 @@ internal async Task ManageRenewals()
                     options.Add(
                         Choice.Create<Func<Task>>(
                             async () => selectedRenewals = await FilterRenewalsMenu(selectedRenewals),
-                            all ? "Apply filter" : "Apply additional filter", "F", state: sortFilterState));
+                            all ? "Apply filter" : "Apply additional filter", "I", state: sortFilterState));
                     options.Add(
                         Choice.Create<Func<Task>>(
                              async () => selectedRenewals = await SortRenewalsMenu(selectedRenewals),

diff --git a/src/main.lib/Services/Serialization/PluginOptions.cs b/src/main.lib/Services/Serialization/PluginOptions.cs
@@ -1,10 +1,8 @@
 using Autofac;
 using PKISharp.WACS.Configuration;
 using PKISharp.WACS.DomainObjects;
-using PKISharp.WACS.Plugins;
 using PKISharp.WACS.Plugins.Base;
 using PKISharp.WACS.Plugins.Interfaces;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace PKISharp.WACS.Services.Serialization