From 6c2865a09db668416c884fd0d050e093235457e1 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 19 Mar 2026 16:27:09 +0100 Subject: [PATCH] simplify port/scheme check --- .../ui/keyloading/hub/CheckHostTrustController.java | 11 +++++------ .../keyloading/hub/CheckHostTrustControllerTest.java | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java index 2201ed18d..18bdbfead 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustController.java @@ -160,12 +160,11 @@ public class CheckHostTrustController implements FxController { } public static String getAuthority(URI uri) { - return switch (uri.getPort()) { - case -1 -> "%s://%s".formatted(uri.getScheme(), uri.getHost()); - case 80 -> "http://%s".formatted(uri.getHost()); - case 443 -> "https://%s".formatted(uri.getHost()); - default -> "%s://%s:%s".formatted(uri.getScheme(), uri.getHost(), uri.getPort()); - }; + if (uri.getPort() == -1) { + return "%s://%s".formatted(uri.getScheme(), uri.getHost()); + } else { + return "%s://%s:%s".formatted(uri.getScheme(), uri.getHost(), uri.getPort()); + } } //--- JavaFX property getter & setter diff --git a/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java b/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java index d6d104b7d..d6feefdb6 100644 --- a/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java +++ b/src/test/java/org/cryptomator/ui/keyloading/hub/CheckHostTrustControllerTest.java @@ -34,8 +34,8 @@ class CheckHostTrustControllerTest { "https://example.com/foo/bar, https://example.com", "https://example.com:8080, https://example.com:8080", "https://user@example.com:8080/foo/bar, https://example.com:8080", - "https://user@example.com:443/foo/bar, https://example.com", - "http://user@example.com:80/foo/bar?foo=bar, http://example.com", + "https://user@example.com:443/foo/bar, https://example.com:443", + "http://user@example.com:80/foo/bar?foo=bar, http://example.com:80", "http://user@example.com:8080/foo/bar?foo=bar, http://example.com:8080" }) void testGetAuthority(String input, String expected) {