From 86ab31745990847c552efa04f31f6b8fb90a61c8 Mon Sep 17 00:00:00 2001 From: TCke83 <3518416+TCke83@users.noreply.github.com> Date: Sat, 25 Oct 2025 13:30:58 +0200 Subject: [PATCH] Remove use of StandardCharsets due to incompatibility with older Java versions (<10) --- .../cz/smarteon/loxone/message/EncryptedCommand.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/cz/smarteon/loxone/message/EncryptedCommand.java b/src/main/java/cz/smarteon/loxone/message/EncryptedCommand.java index e34defd..afc298c 100644 --- a/src/main/java/cz/smarteon/loxone/message/EncryptedCommand.java +++ b/src/main/java/cz/smarteon/loxone/message/EncryptedCommand.java @@ -3,8 +3,8 @@ import cz.smarteon.loxone.app.MiniserverType; import org.jetbrains.annotations.NotNull; +import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.util.function.Function; import static java.util.Objects.requireNonNull; @@ -82,7 +82,7 @@ public static EncryptedCommand getToken(final @NotNull String tokenHash, final @NotNull Function encryptor) { final String cmd = "jdev/sys/gettoken/" + requireNonNull(tokenHash, "tokenHash can't be null") + "/" - + requireNonNull(user, "user can't be null") + "/" + + requireNonNull(user, "user can't be null") + "/" + + requireNonNull(permissionType, "permissionType can't be null").getId() + "/" + requireNonNull(clientUuid, "clientUuid can't be null") + "/" + requireNonNull(clientInfo, "clientInfo can't be null"); @@ -105,6 +105,10 @@ public static EncryptedCommand refreshToken(final String tokenHash, final } private static String encodeUrl(String toEncode) { - return URLEncoder.encode(toEncode, StandardCharsets.UTF_8); + try { + return URLEncoder.encode(toEncode, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new IllegalStateException("UTF-8 encoding should be present everywhere", e); + } } }