Merge pull request #16688 from iterate-ch/bugfix/GH-16683

Register AutoServiceLoader in Terminal
iterate-ch · Dec 18, 2024 · f158abd · f158abd
2 parents 8fb5257 + 6ae823e
commit f158abd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminalPreferences.cs b/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminalPreferences.cs
@@ -18,6 +18,7 @@
 
 using ch.cyberduck.cli;
 using ch.cyberduck.core.cryptomator;
+using ch.cyberduck.core.serviceloader;
 using Ch.Cyberduck.Core;
 using Ch.Cyberduck.Core.Diagnostics;
 using Ch.Cyberduck.Core.Editor;
@@ -68,6 +69,8 @@ protected override void setFactories()
         {
             base.setFactories();
 
+            this.setDefault("factory.autoserviceloader.class",
+                typeof(AppContextServiceLoader).AssemblyQualifiedName);
             this.setDefault("factory.locale.class", typeof(DictionaryLocale).AssemblyQualifiedName);
             this.setDefault("factory.supportdirectoryfinder.class",
                 typeof(RoamingSupportDirectoryFinder).AssemblyQualifiedName);

diff --git a/core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs b/core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs
@@ -15,6 +15,7 @@
 
 using ch.cyberduck.core.i18n;
 using ch.cyberduck.core.preferences;
+using ch.cyberduck.core.serviceloader;
 using java.security;
 using java.util;
 using org.apache.commons.lang3;
@@ -322,6 +323,14 @@ protected override void setDefaults()
         }
     }
 
+    protected override void setFactories()
+    {
+        base.setFactories();
+
+        this.setDefault("factory.autoserviceloader.class",
+                typeof(AppContextServiceLoader).AssemblyQualifiedName);
+    }
+
     private static string TryToMatchLocale(string sysLocale, List appLocales)
     {
         for (int i = 0; i < appLocales.size(); i++)

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/core/preferences/ApplicationPreferences.cs b/windows/src/main/csharp/ch/cyberduck/ui/core/preferences/ApplicationPreferences.cs
@@ -57,8 +57,6 @@ protected override void setFactories()
         {
             base.setFactories();
 
-            this.setDefault("factory.autoserviceloader.class",
-                typeof(AppContextServiceLoader).AssemblyQualifiedName);
             this.setDefault("factory.supportdirectoryfinder.class",
                 typeof(RoamingSupportDirectoryFinder).AssemblyQualifiedName);
             this.setDefault("factory.localsupportdirectoryfinder.class",