From 0df0dbe44a3a84f30a5f5164fab3cab02fafb029 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 29 Aug 2022 12:31:55 +0200 Subject: Allow third-party software to mark servers as secure --- .../java/com/aizistral/nochatreports/NoChatReportsClient.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 62c4185..df919d2 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports; import java.util.List; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.ServerDataExtension; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.gui.UnsafeServerScreen; @@ -96,9 +97,15 @@ public final class NoChatReportsClient implements ClientModInitializer { if (canSend) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else if (ServerSafetyState.forceSignedMessages()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); } else { - ServerSafetyState.updateCurrent(ServerSafetyState.forceSignedMessages() ? - ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE); + if (ServerSafetyState.getLastServerData() instanceof ServerDataExtension ext + && ext.preventsChatReports()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); + } } } -- cgit v1.2.3