Remove explicit and implicit chat auto reconnects

FAForever · Dec 31, 2023 · a2fae9a · a2fae9a
1 parent 9bec826
commit a2fae9a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/src/main/java/com/faforever/client/chat/ChatController.java b/src/main/java/com/faforever/client/chat/ChatController.java
@@ -55,6 +55,7 @@ public class ChatController extends NodeController<AnchorPane> {
   public Pane connectingProgressPane;
   public VBox noOpenTabsContainer;
   public TextField channelNameTextField;
+  public VBox disconnectedPane;
 
   @Override
   protected void onInitialize() {
@@ -86,7 +87,8 @@ private void onChannelJoined(ChatChannel chatChannel) {
 
   private void onDisconnected() {
     fxApplicationThreadExecutor.execute(() -> {
-      connectingProgressPane.setVisible(true);
+      disconnectedPane.setVisible(true);
+      connectingProgressPane.setVisible(false);
       tabPane.setVisible(false);
       tabPane.getTabs().removeIf(Tab::isClosable);
     });
@@ -95,13 +97,15 @@ private void onDisconnected() {
   private void onConnected() {
     chatService.getChannels().forEach(this::onChannelJoined);
     fxApplicationThreadExecutor.execute(() -> {
+      disconnectedPane.setVisible(false);
       connectingProgressPane.setVisible(false);
       tabPane.setVisible(true);
     });
   }
 
   private void onConnecting() {
     fxApplicationThreadExecutor.execute(() -> {
+      disconnectedPane.setVisible(false);
       connectingProgressPane.setVisible(true);
       tabPane.setVisible(false);
     });
@@ -167,4 +171,8 @@ public void onJoinChannelButtonClicked() {
     chatService.joinChannel(channelName);
     channelNameTextField.clear();
   }
+
+  public void onConnectButtonClicked() {
+    chatService.connect();
+  }
 }
diff --git a/src/main/java/com/faforever/client/chat/KittehChatService.java b/src/main/java/com/faforever/client/chat/KittehChatService.java
@@ -151,8 +151,6 @@ public class KittehChatService implements ChatService, InitializingBean, Disposa
   @VisibleForTesting
   DefaultClient client;
 
-  private boolean autoReconnect;
-
   @Override
   public void afterPropertiesSet() {
     loginService.loggedInProperty().subscribe(loggedIn -> {
@@ -541,9 +539,7 @@ private void onDisconnect(ClientConnectionEndedEvent event) {
     channels.values().forEach(ChatChannel::clearUsers);
     channels.clear();
     connectionState.set(ConnectionState.DISCONNECTED);
-    if (autoReconnect) {
-      connect();
-    }
+    client.shutdown();
   }
 
   @Handler
@@ -579,8 +575,12 @@ private void populateColor(ChatChannelUser chatChannelUser) {
 
   @Override
   public void connect() {
+    if (connectionState.get() != ConnectionState.DISCONNECTED) {
+      return;
+    }
+
+    connectionState.set(ConnectionState.CONNECTING);
     log.info("Connecting to IRC");
-    autoReconnect = true;
     Irc irc = clientProperties.getIrc();
     this.defaultChannelName = irc.getDefaultChannel();
 
@@ -629,7 +629,6 @@ public void connect() {
 
   @Override
   public void disconnect() {
-    autoReconnect = false;
     if (client != null) {
       log.info("Disconnecting from IRC");
       client.shutdown("Goodbye");
@@ -731,7 +730,6 @@ public boolean isDefaultChannel(ChatChannel chatChannel) {
 
   @Override
   public void destroy() {
-    autoReconnect = false;
     close();
   }
 

diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties
@@ -335,6 +335,7 @@ tutorial.map = Map
 tutorial.title = Title
 tutorial.length = Length
 tutorial.description = Description
+chat.connect.message=Connect to chat
 chat.connecting.message = Connecting to chat…
 updater.binary.taskTitle = Preparing game files
 clientUpdateAvailable.notification = Client {0} is available ({1})

diff --git a/src/main/resources/theme/chat/chat.fxml b/src/main/resources/theme/chat/chat.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.control.Tab?>
@@ -12,7 +13,7 @@
             fx:controller="com.faforever.client.chat.ChatController">
     <children>
         <TabPane fx:id="tabPane" tabClosingPolicy="ALL_TABS" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                 AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                 AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" visible="false">
             <Tab text="+" closable="false">
                 <VBox fx:id="noOpenTabsContainer" alignment="CENTER" fillWidth="false">
                     <children>
@@ -30,7 +31,7 @@
 
         <VBox fx:id="connectingProgressPane" alignment="CENTER" AnchorPane.bottomAnchor="0.0"
               AnchorPane.leftAnchor="0.0"
-              AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+              AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" visible="false">
             <children>
                 <ProgressIndicator prefHeight="80.0" prefWidth="80.0"/>
                 <Label text="%chat.connecting.message">
@@ -40,5 +41,13 @@
                 </Label>
             </children>
         </VBox>
+
+        <VBox fx:id="disconnectedPane" alignment="CENTER" AnchorPane.bottomAnchor="0.0"
+              AnchorPane.leftAnchor="0.0"
+              AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <children>
+                <Button text="%chat.connect.message" onAction="#onConnectButtonClicked"/>
+            </children>
+        </VBox>
     </children>
 </AnchorPane>