From 10f6b059b15cc6036efe1f637855dc2b58237f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <clement.reniers@etu.univ-lyon1.fr>
Date: Sat, 1 Mar 2025 19:50:19 +0100
Subject: [PATCH] escape strings for real tui

---
 ChatApp/src/client/Client.java          | 11 +++++++++++
 ChatApp/src/client/ClientConnexion.java |  2 +-
 ChatApp/src/client/ClientConsole.java   | 12 ++----------
 ChatApp/src/server/ServerConnexion.java | 12 +-----------
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/ChatApp/src/client/Client.java b/ChatApp/src/client/Client.java
index da92c4a..b9fc998 100644
--- a/ChatApp/src/client/Client.java
+++ b/ChatApp/src/client/Client.java
@@ -23,6 +23,17 @@ public class Client {
 		login(pseudo);
 	}
 
+
+	public static void main(String[] args) {
+		ClientConsole console = new ClientConsole(new InetSocketAddress("localhost", 6665));
+		try {
+			console.joinThread();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		System.out.println("End !");
+	}
+
 	public void close() {
 		this.connexion.sendPacket(new DisconnectPacket("Leaving"));
 		this.connexion.close();
diff --git a/ChatApp/src/client/ClientConnexion.java b/ChatApp/src/client/ClientConnexion.java
index 1024d86..c463a46 100644
--- a/ChatApp/src/client/ClientConnexion.java
+++ b/ChatApp/src/client/ClientConnexion.java
@@ -41,7 +41,7 @@ public class ClientConnexion implements PacketVisitor, PacketHandler {
 		for (int i = 0; i < 5; i++) {
 			sendPacket(new HandshakePacket());
 		}
-		new Thread(() -> waitForHandshake()).start();
+		new Thread(this::waitForHandshake).start();
 	}
 
 	private void waitForHandshake() {
diff --git a/ChatApp/src/client/ClientConsole.java b/ChatApp/src/client/ClientConsole.java
index 8c7d6af..607d0f3 100644
--- a/ChatApp/src/client/ClientConsole.java
+++ b/ChatApp/src/client/ClientConsole.java
@@ -17,16 +17,6 @@ public class ClientConsole implements ClientListener {
 	private final Scanner scanner;
 	private volatile boolean connected = false;
 
-	public static void main(String[] args) {
-		ClientConsole console = new ClientConsole(new InetSocketAddress("localhost", 6665));
-		try {
-			console.joinThread();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		System.out.println("End !");
-	}
-
 	public ClientConsole(InetSocketAddress address) {
 		this.inputThread = new Thread(this::inputLoop);
 		this.scanner = new Scanner(System.in);
@@ -109,6 +99,8 @@ public class ClientConsole implements ClientListener {
 			} else {
 				this.client.SendChatMessage(message);
 			}
+			System.out.print("\033[1A\r\033[2K"); // weird sequence to clear the line (but it works !)
+			System.out.flush();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/ChatApp/src/server/ServerConnexion.java b/ChatApp/src/server/ServerConnexion.java
index 7889453..a38d456 100644
--- a/ChatApp/src/server/ServerConnexion.java
+++ b/ChatApp/src/server/ServerConnexion.java
@@ -8,17 +8,7 @@ import java.time.Instant;
 import network.SocketWriter;
 import network.protocol.Packet;
 import network.protocol.PacketVisitor;
-import network.protocol.packets.ChatMessagePacket;
-import network.protocol.packets.CreateRoomPacket;
-import network.protocol.packets.DisconnectPacket;
-import network.protocol.packets.HandshakePacket;
-import network.protocol.packets.JoinRoomPacket;
-import network.protocol.packets.LeaveRoomPacket;
-import network.protocol.packets.LoginPacket;
-import network.protocol.packets.RequestRoomListPacket;
-import network.protocol.packets.RoomListPacket;
-import network.protocol.packets.SendChatMessagePacket;
-import network.protocol.packets.ServerResponsePacket;
+import network.protocol.packets.*;
 import network.protocol.packets.ServerResponsePacket.Response;
 
 public class ServerConnexion implements PacketVisitor {