From 9968865d0eb6fd298dcd00082e28067f8e15cbc8 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Fri, 17 Mar 2023 13:17:23 +0000 Subject: [PATCH] Updated parsing of "encoding" in websockets, for consistency with other params. --- .../java/org/qortal/api/websocket/ActiveChatsWebSocket.java | 3 ++- .../java/org/qortal/api/websocket/ChatMessagesWebSocket.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java b/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java index 960ac8c1..9ac9f87d 100644 --- a/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java +++ b/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java @@ -102,7 +102,8 @@ public class ActiveChatsWebSocket extends ApiWebSocket { private Encoding getTargetEncoding(Session session) { // Default to Base58 if not specified, for backwards support Map> queryParams = session.getUpgradeRequest().getParameterMap(); - String encoding = (queryParams.get("encoding") != null && !queryParams.get("encoding").isEmpty()) ? queryParams.get("encoding").get(0) : "BASE58"; + List encodingList = queryParams.get("encoding"); + String encoding = (encodingList != null && encodingList.size() == 1) ? encodingList.get(0) : "BASE58"; return Encoding.valueOf(encoding); } diff --git a/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java b/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java index e443ee78..3046c1c1 100644 --- a/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java +++ b/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java @@ -180,7 +180,8 @@ public class ChatMessagesWebSocket extends ApiWebSocket { private Encoding getTargetEncoding(Session session) { // Default to Base58 if not specified, for backwards support Map> queryParams = session.getUpgradeRequest().getParameterMap(); - String encoding = (queryParams.get("encoding") != null && !queryParams.get("encoding").isEmpty()) ? queryParams.get("encoding").get(0) : "BASE58"; + List encodingList = queryParams.get("encoding"); + String encoding = (encodingList != null && encodingList.size() == 1) ? encodingList.get(0) : "BASE58"; return Encoding.valueOf(encoding); }