zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Made postingPermanentlyDisabled further idiot-proof

Browse Source 
Additionally deleted annoying alert notifying me that I'm offline.
This commit is contained in:
delvh 2020-06-27 09:34:30 +02:00
parent bc230575f4
commit 5a933fab4e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/envoy/client/ui/controller/ChatScene.java
View File

@ -204,7 +204,7 @@ public final class ChatScene {
remainingChars remainingChars
.setText(String.format("remaining chars: %d/%d", MAX_MESSAGE_LENGTH - messageTextArea.getText().length(), MAX_MESSAGE_LENGTH)); .setText(String.format("remaining chars: %d/%d", MAX_MESSAGE_LENGTH - messageTextArea.getText().length(), MAX_MESSAGE_LENGTH));
} }
messageTextArea.setDisable(currentChat == null); messageTextArea.setDisable(currentChat == null || postingPermanentlyDisabled);
} }
/** /**
@ -256,10 +256,13 @@ public final class ChatScene {
|| !settings.isEnterToSend() && e.getCode() == KeyCode.ENTER && e.isControlDown())) || !settings.isEnterToSend() && e.getCode() == KeyCode.ENTER && e.isControlDown()))
postMessage(); postMessage();
postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null); postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
} else if (!infoLabel.getText().equals("You need to go online to send more messages")) } else {
final var noMoreMessaging = "Go online to send messages";
if (!infoLabel.getText().equals(noMoreMessaging))
// Informing the user that he is a f*cking moron and should use Envoy online // Informing the user that he is a f*cking moron and should use Envoy online
// because he ran out of messageIDs to use // because he ran out of messageIDs to use
updateInfoLabel("You need to go online to send more messages", Color.RED); updateInfoLabel(noMoreMessaging, Color.RED);
}
} }
/** /**
@ -301,6 +304,8 @@ public final class ChatScene {
postingPermanentlyDisabled = !(client.isOnline() || localDB.getIDGenerator().hasNext()); postingPermanentlyDisabled = !(client.isOnline() || localDB.getIDGenerator().hasNext());
if (postingPermanentlyDisabled) { if (postingPermanentlyDisabled) {
postButton.setDisable(true); postButton.setDisable(true);
messageTextArea.setDisable(true);
messageTextArea.clear();
updateInfoLabel("You need to go online to send more messages", Color.RED); updateInfoLabel("You need to go online to send more messages", Color.RED);
return; return;
} }

1
src/main/java/envoy/client/ui/controller/LoginScene.java
View File

@ -159,7 +159,6 @@ public final class LoginScene {
final User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier()); final User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown"); if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
client.setSender(clientUser); client.setSender(clientUser);
new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.").showAndWait();
loadChatScene(); loadChatScene();
} catch (final Exception e) { } catch (final Exception e) {
new Alert(AlertType.ERROR, "Client error: " + e).showAndWait(); new Alert(AlertType.ERROR, "Client error: " + e).showAndWait();