From e08b0a3cd401685d42050a5594abe8c5b4afc0a1 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 29 Aug 2022 12:37:32 +0200 Subject: Revert "Allow third-party software to mark servers as secure" This reverts commit 0df0dbe44a3a84f30a5f5164fab3cab02fafb029. --- .../java/com/aizistral/nochatreports/NoChatReportsClient.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index df919d2..62c4185 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -3,7 +3,6 @@ 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; @@ -97,15 +96,9 @@ public final class NoChatReportsClient implements ClientModInitializer { if (canSend) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); - } else if (ServerSafetyState.forceSignedMessages()) { - ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); } else { - if (ServerSafetyState.getLastServerData() instanceof ServerDataExtension ext - && ext.preventsChatReports()) { - ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); - } else { - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); - } + ServerSafetyState.updateCurrent(ServerSafetyState.forceSignedMessages() ? + ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE); } } -- cgit v1.2.3