From efa7b6ec22b54adc7fbed3bb3a1bb48534b03d74 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 9 Jun 2023 16:43:41 +0200 Subject: Account for full-width colon when decrypting Fixes #376 --- .../com/aizistral/nochatreports/common/core/EncryptionUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java index 842dc86..0bf2d77 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java @@ -2,6 +2,7 @@ package com.aizistral.nochatreports.common.core; import java.util.Optional; +import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.encryption.Encryptor; @@ -55,9 +56,12 @@ public class EncryptionUtil { public static Optional tryDecrypt(String message, Encryptor encryptor) { try { - String[] splat = message.contains(" ") ? message.split(" ") : new String[] { message }; + String messageCopy = message.replace(':', ' '); + String[] splat = messageCopy.contains(" ") ? messageCopy.split(" ") : new String[] { messageCopy }; String decryptable = splat[splat.length-1]; + NCRCore.LOGGER.info("Decryptable: " + decryptable); + String decrypted = encryptor.decrypt(decryptable); if (decrypted.startsWith("#%")) -- cgit v1.2.3