From 1338d91f086641659fed5160c74b4811d98c228f Mon Sep 17 00:00:00 2001 From: festino Date: Wed, 27 Sep 2023 22:18:50 +0300 Subject: Fix long encrypted string causing EncoderException (#429) --- .../common/mixins/client/MixinChatScreen.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 3203d33..f94c8a6 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -13,6 +13,7 @@ import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; +import com.aizistral.nochatreports.common.encryption.Encryptor; import com.aizistral.nochatreports.common.gui.AdvancedImageButton; import com.aizistral.nochatreports.common.gui.AdvancedTooltip; import com.aizistral.nochatreports.common.gui.EncryptionButton; @@ -45,6 +46,7 @@ import net.minecraft.resources.ResourceLocation; @Mixin(ChatScreen.class) public abstract class MixinChatScreen extends Screen { + private static final int MESSAGE_MAX_LENGTH = 256; private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons_extended.png"); private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png"); private AdvancedImageButton safetyStatusButton; @@ -96,11 +98,24 @@ public abstract class MixinChatScreen extends Screen { String encrypt = message.substring(index, message.length()); if (encrypt.length() > 0) { - info.setReturnValue(noencrypt + e.encrypt("#%" + encrypt)); + int maxEncryptedLength = MESSAGE_MAX_LENGTH - noencrypt.length(); + info.setReturnValue(noencrypt + getEncrypted(e, encrypt, maxEncryptedLength)); } }); } } + + private String getEncrypted(Encryptor e, String encrypt, int maxLength) { + while (encrypt.length() > 0) { + String encrypted = e.encrypt("#%" + encrypt); + if (encrypted.length() <= maxLength) + return encrypted; + + encrypt = encrypt.substring(0, encrypt.length() - 1); + } + + return ""; + } @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { -- cgit v1.2.3