crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Updated parsing of "encoding" in websockets, for consistency with other params.

Browse Source
This commit is contained in:
CalDescent 2023-03-17 13:17:23 +00:00
parent 05eb337367
commit 9968865d0e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java
View File

@ -102,7 +102,8 @@ public class ActiveChatsWebSocket extends ApiWebSocket {
private Encoding getTargetEncoding(Session session) { private Encoding getTargetEncoding(Session session) {
// Default to Base58 if not specified, for backwards support // Default to Base58 if not specified, for backwards support
Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap(); Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
String encoding = (queryParams.get("encoding") != null && !queryParams.get("encoding").isEmpty()) ? queryParams.get("encoding").get(0) : "BASE58"; List<String> encodingList = queryParams.get("encoding");
String encoding = (encodingList != null && encodingList.size() == 1) ? encodingList.get(0) : "BASE58";
return Encoding.valueOf(encoding); return Encoding.valueOf(encoding);
} }

3
src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java
View File

@ -180,7 +180,8 @@ public class ChatMessagesWebSocket extends ApiWebSocket {
private Encoding getTargetEncoding(Session session) { private Encoding getTargetEncoding(Session session) {
// Default to Base58 if not specified, for backwards support // Default to Base58 if not specified, for backwards support
Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap(); Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
String encoding = (queryParams.get("encoding") != null && !queryParams.get("encoding").isEmpty()) ? queryParams.get("encoding").get(0) : "BASE58"; List<String> encodingList = queryParams.get("encoding");
String encoding = (encodingList != null && encodingList.size() == 1) ? encodingList.get(0) : "BASE58";
return Encoding.valueOf(encoding); return Encoding.valueOf(encoding);
} }