Version Ok tentative proxy

src/main/java/app/insa/clav/Core/Model.java

@@ -1,8 +1,6 @@
 package app.insa.clav.Core;
 
-import app.insa.clav.Messages.Message;
-import app.insa.clav.Messages.MessageInit;
-import app.insa.clav.Messages.MessagePseudo;
+import app.insa.clav.Messages.*;
 import app.insa.clav.Reseau.*;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -11,6 +9,9 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.net.*;
@@ -329,12 +330,25 @@ public class Model implements PropertyChangeListener{
             }
         }
         if (!isChatAlreadyCreated) {
-            synchronized (userList) {
-                for (Utilisateurs u : userList) {
-                    if (u.getPseudo().equals(remotePseudo)) {
-                        MessageInit msgInit = new MessageInit(7, user.getInetAddress(), u.getInetAddress(), u.getTcpListeningPort(), user.getId());
-                        TCPChatConnection tcpCo = new TCPChatConnection(msgInit, u.getInetAddress(), u.getTcpListeningPort(), u.getId());
-                        listTCPConnection.add(tcpCo);
+            Utilisateurs remoteUser = this.getUserFromId(remoteId);
+            if (remoteUser.isOutdoor() || this.user.isOutdoor()) {
+                System.out.println("Creation d'un chat avec un outdoor");
+                MessageInit msgInit = new MessageInit(7, user.getInetAddress(), remoteUser.getInetAddress(), remoteUser.getTcpListeningPort(), user.getId());
+                this.servCon.SubmitConnectionChat(remoteUser.getId(), msgInit);
+                TCPChatConnection tcpCo = new TCPChatConnection(null, remoteId, this.user.getId(), null, null, null, null);
+                tcpCo.setOutdoor();
+                tcpCo.startTCPCo();
+                listTCPConnection.add(tcpCo);
+            } else {
+                System.out.println("Creattion d'un chat avec un indoor");
+                synchronized (userList) {
+                    for (Utilisateurs u : userList) {
+                        if (u.getPseudo().equals(remotePseudo)) {
+                            MessageInit msgInit = new MessageInit(7, user.getInetAddress(), u.getInetAddress(), u.getTcpListeningPort(), user.getId());
+                            TCPChatConnection tcpCo = new TCPChatConnection(msgInit, u.getInetAddress(), u.getTcpListeningPort(), u.getId());
+                            tcpCo.startTCPCo();
+                            listTCPConnection.add(tcpCo);
+                        }
                     }
                 }
             }
@@ -428,18 +442,16 @@ public class Model implements PropertyChangeListener{
      */
     private void handleType1Message(MessagePseudo msg){
         MessagePseudo msgResponse;
-        //System.out.println("Message de type 1 reçu : " + msg.toString());
-        if (msg.id != this.user.getId()) {
-            if (this.user.getPseudo().equals(msg.pseudo)){
+        System.out.println("Message de type 1 reçu : " + msg.toString() + " local addr IP " + this.user.getInetAddress());
+        if (!this.user.getInetAddress().equals(msg.srcIP)) {
+            if (this.user.getPseudo().equals(msg.pseudo)) {
                 msgResponse = new MessagePseudo(3, null, msg.pseudo, 0, 0);
                 //System.out.println("Pseudo pas OK, on envoi : " + msgResponse.toString());
-            } else{
-                msgResponse = new MessagePseudo(2, this.user.getInetAddress(),this.user.getPseudo(), this.user.getTcpListeningPort(), this.user.getId());
+            } else {
+                msgResponse = new MessagePseudo(2, this.user.getInetAddress(), this.user.getPseudo(), this.user.getTcpListeningPort(), this.user.getId());
                 //System.out.println("Pseudo OK, on envoi : " + msgResponse.toString());
             }
             this.UDPOut.sendMsg(msgResponse, msg.srcIP);
-        } else {
-            //System.out.println("Moi-même -> IGNORED");
         }
     }
 
@@ -546,6 +558,19 @@ public class Model implements PropertyChangeListener{
     }
 
 
+    public void recupAndHandleConnexion() {
+        ArrayList<MessageInit> messages = this.servCon.GetConnectionChat(this.user.getId());
+        if (messages != null) {
+            for (Iterator<MessageInit> iter = messages.iterator(); iter.hasNext(); ) {
+                MessageInit msg = iter.next();
+                TCPChatConnection newCo = new TCPChatConnection(null, msg.id, this.user.getId(), null, null, null, null);
+                newCo.setOutdoor();
+                newCo.startTCPCo();
+                this.listTCPConnection.add(newCo);
+            }
+        }
+    }
+
 
     /**
      * Classe interne au model pour au bout d'une seconde d'envoi de demande pseudo type 1,
@@ -687,6 +712,8 @@ public class Model implements PropertyChangeListener{
 
             Collections.sort(userList);
             support.firePropertyChange("newUserConnected",-1,-2);
+
+            recupAndHandleConnexion();
         }
     }
 

src/main/java/app/insa/clav/Messages/MessageSrvTCP.java

@@ -0,0 +1,26 @@
+package app.insa.clav.Messages;
+
+
+public class MessageSrvTCP {
+    private int userId;
+    private int id;
+    private Message message;
+
+    public MessageSrvTCP(int userId, int id, Message message) {
+        this.userId = userId;
+        this.id = id;
+        this.message = message;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public Message getMessage() {
+        return message;
+    }
+}

src/main/java/app/insa/clav/Reseau/ServletConnection.java

@@ -1,5 +1,7 @@
 package app.insa.clav.Reseau;
 import app.insa.clav.Core.Utilisateurs;
+import app.insa.clav.Messages.Message;
+import app.insa.clav.Messages.MessageInit;
 import app.insa.clav.Messages.MessagePseudo;
 
 import java.io.BufferedReader;
@@ -15,6 +17,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import app.insa.clav.Messages.MessageSrvTCP;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
@@ -215,4 +218,134 @@ public class ServletConnection {
             e.printStackTrace();
         }
     }
+
+    public void SubmitMessageChat(int userId, int remoteId, Message msg){
+        URL url = null;
+        HttpURLConnection con = null;
+        try {
+            url = new URL(baseURL + "SubmitMessageChat");
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            con = (HttpURLConnection) url.openConnection();
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-Type", "application/json; utf-8");
+            con.setDoOutput(true);
+            try(OutputStream os = con.getOutputStream()) {
+                byte[] input = gson.toJson(new MessageSrvTCP(userId, remoteId, msg)).getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+            int status = con.getResponseCode();
+            System.out.println("Error code HTTP request submit msg chat = " + status);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void SubmitConnectionChat(int userId, MessageInit msg){
+        URL url = null;
+        HttpURLConnection con = null;
+        try {
+            url = new URL(baseURL + "SubmitConnectionChat");
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            con = (HttpURLConnection) url.openConnection();
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-Type", "application/json; utf-8");
+            con.setDoOutput(true);
+            try(OutputStream os = con.getOutputStream()) {
+                byte[] input = gson.toJson(new MessageSrvTCP(userId, 0, msg)).getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+            int status = con.getResponseCode();
+            System.out.println("Error code HTTP request submit connection  avec = " + status);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Message GetMessageChat(int userId, int remoteId){
+        //System.out.println("Demande");
+        URL url = null;
+        HttpURLConnection con = null;
+        Message resList = null;
+        try {
+            url = new URL(baseURL + "GetMessageChat");
+        } catch (MalformedURLException e) {
+            System.out.println("Erreur recup message avec " + url.toString());
+            //e.printStackTrace();
+        }
+        try {
+            con = (HttpURLConnection) url.openConnection();
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-Type", "application/json; utf-8");
+            con.setDoOutput(true);
+            con.setDoInput(true);
+            try(OutputStream os = con.getOutputStream()) {
+                byte[] input = gson.toJson(new MessageSrvTCP(userId, remoteId, null)).getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+            int status = con.getResponseCode();
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(con.getInputStream()));
+            String inputLine;
+            StringBuffer content = new StringBuffer();
+            while ((inputLine = in.readLine()) != null) {
+                content.append(inputLine);
+            }
+            in.close();
+            System.out.println("Response : " + content);
+            resList = gson.fromJson(content.toString(),Message.class);
+            //resList = new Utilisateurs[Integer.parseInt(con.getHeaderField("sizeArray"))];
+        } catch (IOException e) {
+            System.out.println("Erreur recup msg chat 2 avec " + url.toString());
+            e.printStackTrace();
+        }
+        return resList;
+    }
+
+    public ArrayList<MessageInit> GetConnectionChat(int userId){
+        URL url = null;
+        HttpURLConnection con = null;
+        ArrayList<MessageInit> resList = null;
+        try {
+            url = new URL(baseURL + "GetConnectionChat");
+        } catch (MalformedURLException e) {
+            System.out.println("Erreur recup connecion" + url.toString());
+            //e.printStackTrace();
+        }
+        try {
+            con = (HttpURLConnection) url.openConnection();
+            con.setRequestMethod("POST");
+            con.setRequestProperty("Content-Type", "application/json; utf-8");
+            con.setDoOutput(true);
+            con.setDoInput(true);
+            try(OutputStream os = con.getOutputStream()) {
+                byte[] input = gson.toJson(new MessageSrvTCP(userId, 0, null)).getBytes(StandardCharsets.UTF_8);
+                os.write(input, 0, input.length);
+            }
+            int status = con.getResponseCode();
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(con.getInputStream()));
+            String inputLine;
+            StringBuffer content = new StringBuffer();
+            while ((inputLine = in.readLine()) != null) {
+                content.append(inputLine);
+            }
+            in.close();
+            System.out.println("Response : " + content);
+            Type listType = new TypeToken<ArrayList<MessageInit>>(){}.getType();
+            resList = gson.fromJson(content.toString(),listType);
+            //resList = new Utilisateurs[Integer.parseInt(con.getHeaderField("sizeArray"))];
+        } catch (IOException e) {
+            System.out.println("Erreur recup connecion 2 " + url.toString());
+            e.printStackTrace();
+        }
+        return resList;
+    }
 }

src/main/java/app/insa/clav/Reseau/TCPChatConnection.java

@@ -1,4 +1,5 @@
 package app.insa.clav.Reseau;
+import app.insa.clav.Core.Utilisateurs;
 import app.insa.clav.Messages.*;
 import app.insa.clav.UISubStages.ChatStage;
 import javafx.application.Platform;
@@ -35,18 +36,22 @@ public class TCPChatConnection extends Thread{
     private ObjectInputStream objectInStream;
     private DataInputStream dis;
     private DataOutputStream dos;
+    private boolean isOutdoor;
+    private ServletConnection serCon;
 
     PropertyChangeSupport support;
 
     public int remoteUserId;
     public int localUserId;
 
+
     /**
      * Constructeur utilisé quand l'utilisateur distant inititie la connexion
      * @param link
      */
     public TCPChatConnection(Socket link, int remoteUserId, int localUserId,InputStream is, OutputStream os, ObjectOutputStream objectOutputStream, ObjectInputStream objectInputStream){
         this.link = link;
+        this.isOutdoor = false;
         this.objectOutStream = objectOutputStream;
         this.objectInStream = objectInputStream;
         this.dos = new DataOutputStream(os);
@@ -55,9 +60,9 @@ public class TCPChatConnection extends Thread{
         this.msgReceivedBufferFiles = new ArrayList<MessageDisplayFile>();
         this.remoteUserId = remoteUserId;
         this.localUserId = localUserId;
+        this.serCon = ServletConnection.getInstance();
         this.support = new PropertyChangeSupport(this);
         Platform.runLater(() -> new ChatStage(this));
-        this.start();
     }
 
     /**
@@ -90,15 +95,28 @@ public class TCPChatConnection extends Thread{
         } catch (IOException e) {
             e.printStackTrace();
         }
+        this.isOutdoor = false;
+        this.serCon = ServletConnection.getInstance();
         this.msgReceivedBuffer = new ArrayList<Message>();
         this.msgReceivedBufferFiles = new ArrayList<MessageDisplayFile>();
         this.remoteUserId = remoteUserId;
         this.localUserId = msgInit.id;
         this.support = new PropertyChangeSupport(this);
         Platform.runLater(() -> new ChatStage(this));
+    }
+
+    public void startTCPCo() {
         this.start();
     }
 
+    public void setOutdoor() {
+        this.isOutdoor = true;
+    }
+
+    public boolean isOutdoor() {
+        return this.isOutdoor;
+    }
+
     public void addPropertyChangeListener(PropertyChangeListener pcl){
         this.support.addPropertyChangeListener("messageTextReceivedTCP",pcl);
         this.support.addPropertyChangeListener("connectionChatClosed",pcl);
@@ -127,99 +145,164 @@ public class TCPChatConnection extends Thread{
 
     @Override
     public void run() {
-        while (true){
-            Message msgReceived = null;
-            try {
-                msgReceived = (Message) this.objectInStream.readObject();
-                System.out.println("Message reçu");
-            } catch (IOException e) {
-                this.support.firePropertyChange("userDisconnected",true,false);
-                break;
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
-            if (msgReceived.typeMessage == 8){
-                this.support.firePropertyChange("connectionChatClosed",true,false);
-                break;
-            }
-            else if (msgReceived.typeMessage == 9){
-                int bytes = 0;
-                MessageChatFile msgFile = (MessageChatFile) msgReceived;
+        if (!this.isOutdoor) {
+            while (true) {
+                Message msgReceived = null;
                 try {
-                    String path;
-                    if (localUserId > remoteUserId){
-                        path = "./file_" + remoteUserId + "_" + localUserId + "_" + msgFile.date + "." + msgFile.ext;
-                    }
-                    else{
-                        path = "./file_" + localUserId + "_" + remoteUserId + "_" + msgFile.date + "." + msgFile.ext;
-                    }
-                    File file = new File(path);
-                    FileOutputStream fileOutputStream = new FileOutputStream(file);
-                    long size = msgFile.fileSize;
-                    byte[] buffer = new byte[4*1024];
-                    while (size > 0){
-                        bytes = dis.read(buffer, 0, (int)Math.min(buffer.length, size));
-                        fileOutputStream.write(buffer,0,bytes);
-                        size -= bytes;
-                    }
-                    System.out.println("Reception fichier terminée");
-                    int type = 2;
-                    switch (msgFile.ext) {
-                        case "png":
-                        case "gif":
-                        case "jpeg":
-                        case "svg":
-                        case "jpg":
-                            type = 3;
-                            break;
-                    }
-                    this.msgReceivedBufferFiles.add(new MessageDisplayFile(this.remoteUserId,msgFile.date,msgFile.payload,type,file,msgFile.ext, -1));
-                    this.support.firePropertyChange("fileReceived",true,false);
-                    fileOutputStream.close();
-                    file.deleteOnExit();
+                    msgReceived = (Message) this.objectInStream.readObject();
+                    System.out.println("Message reçu");
                 } catch (IOException e) {
+                    this.support.firePropertyChange("userDisconnected", true, false);
+                    break;
+                } catch (ClassNotFoundException e) {
                     e.printStackTrace();
                 }
+                if (msgReceived.typeMessage == 8) {
+                    this.support.firePropertyChange("connectionChatClosed", true, false);
+                    break;
+                } else if (msgReceived.typeMessage == 9) {
+                    int bytes = 0;
+                    MessageChatFile msgFile = (MessageChatFile) msgReceived;
+                    try {
+                        String path;
+                        if (localUserId > remoteUserId) {
+                            path = "./file_" + remoteUserId + "_" + localUserId + "_" + msgFile.date + "." + msgFile.ext;
+                        } else {
+                            path = "./file_" + localUserId + "_" + remoteUserId + "_" + msgFile.date + "." + msgFile.ext;
+                        }
+                        File file = new File(path);
+                        FileOutputStream fileOutputStream = new FileOutputStream(file);
+                        long size = msgFile.fileSize;
+                        byte[] buffer = new byte[4 * 1024];
+                        while (size > 0) {
+                            bytes = dis.read(buffer, 0, (int) Math.min(buffer.length, size));
+                            fileOutputStream.write(buffer, 0, bytes);
+                            size -= bytes;
+                        }
+                        System.out.println("Reception fichier terminée");
+                        int type = 2;
+                        switch (msgFile.ext) {
+                            case "png":
+                            case "gif":
+                            case "jpeg":
+                            case "svg":
+                            case "jpg":
+                                type = 3;
+                                break;
+                        }
+                        this.msgReceivedBufferFiles.add(new MessageDisplayFile(this.remoteUserId, msgFile.date, msgFile.payload, type, file, msgFile.ext, -1));
+                        this.support.firePropertyChange("fileReceived", true, false);
+                        fileOutputStream.close();
+                        file.deleteOnExit();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    this.msgReceivedBuffer.add(msgReceived);
+                    this.support.firePropertyChange("messageTextReceivedTCP", true, false);
+                }
             }
-            else {
-                this.msgReceivedBuffer.add(msgReceived);
-                this.support.firePropertyChange("messageTextReceivedTCP", true, false);
+        } else {
+            while (true) {
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                Message msgReceived = this.serCon.GetMessageChat(this.localUserId, this.remoteUserId);
+                if (msgReceived != null) {//this.support.firePropertyChange("userDisconnected", true, false);
+
+                    if (msgReceived.typeMessage == 8) {
+                        this.support.firePropertyChange("connectionChatClosed", true, false);
+                        break;
+                    } else if (msgReceived.typeMessage == 9) {
+                        int bytes = 0;
+                        MessageChatFile msgFile = (MessageChatFile) msgReceived;
+                        try {
+                            String path;
+                            if (localUserId > remoteUserId) {
+                                path = "./file_" + remoteUserId + "_" + localUserId + "_" + msgFile.date + "." + msgFile.ext;
+                            } else {
+                                path = "./file_" + localUserId + "_" + remoteUserId + "_" + msgFile.date + "." + msgFile.ext;
+                            }
+                            File file = new File(path);
+                            FileOutputStream fileOutputStream = new FileOutputStream(file);
+                            long size = msgFile.fileSize;
+                            byte[] buffer = new byte[4 * 1024];
+                            while (size > 0) {
+                                bytes = dis.read(buffer, 0, (int) Math.min(buffer.length, size));
+                                fileOutputStream.write(buffer, 0, bytes);
+                                size -= bytes;
+                            }
+                            System.out.println("Reception fichier terminée");
+                            int type = 2;
+                            switch (msgFile.ext) {
+                                case "png":
+                                case "gif":
+                                case "jpeg":
+                                case "svg":
+                                case "jpg":
+                                    type = 3;
+                                    break;
+                            }
+                            this.msgReceivedBufferFiles.add(new MessageDisplayFile(this.remoteUserId, msgFile.date, msgFile.payload, type, file, msgFile.ext, -1));
+                            this.support.firePropertyChange("fileReceived", true, false);
+                            fileOutputStream.close();
+                            file.deleteOnExit();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    } else {
+                        this.msgReceivedBuffer.add(msgReceived);
+                        this.support.firePropertyChange("messageTextReceivedTCP", true, false);
+                    }
+                }
             }
         }
     }
 
     public void sendMessageTxt(MessageDisplay msgDisp){
-        if (this.link == null) {
-            System.out.println("LINK NULL");
-        }
-        MessageChatTxt msg = new MessageChatTxt(6,this.link.getLocalAddress(),this.link.getInetAddress(),this.link.getPort(),msgDisp.getPayload(),msgDisp.getDate());
-        try {
-            this.objectOutStream.writeObject(msg);
-        } catch (IOException e) {
-            e.printStackTrace();
+        if (!isOutdoor) {
+            if (this.link == null) {
+                System.out.println("LINK NULL");
+            }
+            MessageChatTxt msg = new MessageChatTxt(6, this.link.getLocalAddress(), this.link.getInetAddress(), this.link.getPort(), msgDisp.getPayload(), msgDisp.getDate());
+            try {
+                this.objectOutStream.writeObject(msg);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            Message msg = new MessageChatTxt(6, null, null, 0, msgDisp.getPayload(), msgDisp.getDate());
+            this.serCon.SubmitMessageChat(this.remoteUserId, this.localUserId, msg);
         }
     }
 
 
     public void sendMessageFile(MessageDisplayFile msgDisp){
-        int bytes = 0;
-        MessageChatFile msgStartofFile = new MessageChatFile(9,this.link.getLocalAddress(),this.link.getInetAddress(),this.link.getPort(),msgDisp.getPayload(),msgDisp.getDate(),msgDisp.getFile().length(),msgDisp.getExt());
-        try {
-            this.objectOutStream.writeObject(msgStartofFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        if (!isOutdoor) {
+            int bytes = 0;
+            MessageChatFile msgStartofFile = new MessageChatFile(9,this.link.getLocalAddress(),this.link.getInetAddress(),this.link.getPort(),msgDisp.getPayload(),msgDisp.getDate(),msgDisp.getFile().length(),msgDisp.getExt());
+            try {
+                this.objectOutStream.writeObject(msgStartofFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
 
-        try {
-            FileInputStream fis = new FileInputStream(msgDisp.getFile());
-            byte[] buffer = new byte[4*1024];
-            while ((bytes=fis.read(buffer))!=-1){
-                dos.write(buffer,0,bytes);
-                dos.flush();
+            try {
+                FileInputStream fis = new FileInputStream(msgDisp.getFile());
+                byte[] buffer = new byte[4*1024];
+                while ((bytes=fis.read(buffer))!=-1){
+                    dos.write(buffer,0,bytes);
+                    dos.flush();
+                }
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
             }
-            fis.close();
-        } catch (IOException e) {
-            e.printStackTrace();
+        } else {
+            Message msg = new MessageChatFile(9,null, null, 0,msgDisp.getPayload(),msgDisp.getDate(),msgDisp.getFile().length(),msgDisp.getExt());
+            this.serCon.SubmitMessageChat(this.remoteUserId, this.localUserId, msg);
         }
     }
 
@@ -227,11 +310,16 @@ public class TCPChatConnection extends Thread{
      * When receiving a type 8 message, closed the chat connection
      */
     public void sendCloseChat() {
-        Message msg = new Message(8, this.link.getLocalAddress());
-        try {
-            this.objectOutStream.writeObject(msg);
-        } catch (IOException e) {
-            e.printStackTrace();
+        if (!isOutdoor) {
+            Message msg = new Message(8, this.link.getLocalAddress());
+            try {
+                this.objectOutStream.writeObject(msg);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            Message msg = new Message(8, null);
+            this.serCon.SubmitMessageChat(this.remoteUserId, this.localUserId, msg);
         }
     }
 

src/main/java/app/insa/clav/Reseau/TCPListener.java

@@ -80,7 +80,9 @@ public class TCPListener extends Thread{
                 ObjectInputStream objectInStream = new ObjectInputStream(is);
                 MessageInit msgInit = (MessageInit) objectInStream.readObject();
                 int remoteUserId = msgInit.id;
-                this.bufferTCPConnection.add(new TCPChatConnection(link,remoteUserId,localId,is,os,objectOutStream,objectInStream));
+                TCPChatConnection tcpCo = new TCPChatConnection(link,remoteUserId,localId,is,os,objectOutStream,objectInStream);
+                tcpCo.startTCPCo();
+                this.bufferTCPConnection.add(tcpCo);
                 this.support.firePropertyChange("chatCreated",true,false);
             } catch (IOException | ClassNotFoundException e) {
                 e.printStackTrace();

src/main/java/app/insa/clav/UIControllers/ChatWindowController.java

@@ -357,40 +357,40 @@ public class ChatWindowController implements Initializable, PropertyChangeListen
      * @param actionEvent
      */
     public void buttonSendMessageClicked(ActionEvent actionEvent) {
-        this.sendButton.setDisable(true);
-        String timeStamp = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss").format(new Date());
-        String payload = this.messageInput.getText();
-        if (!payload.equals("")) {
-            MessageDisplay msg = new MessageDisplay(model.user.getId(),timeStamp,payload,1);
-            this.listMessages.add(msg);
-            this.messageInput.clear();
-            this.tcpCo.sendMessageTxt(msg);
-            this.dbAccess.addMessage(this.localUserId,this.remoteUser.getId(),msg);
-        }
+            this.sendButton.setDisable(true);
+            String timeStamp = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss").format(new Date());
+            String payload = this.messageInput.getText();
+            if (!payload.equals("")) {
+                MessageDisplay msg = new MessageDisplay(model.user.getId(), timeStamp, payload, 1);
+                this.listMessages.add(msg);
+                this.messageInput.clear();
+                this.tcpCo.sendMessageTxt(msg);
+                this.dbAccess.addMessage(this.localUserId, this.remoteUser.getId(), msg);
+            }
 
-        //We send the File if the filed is not null
-        if (this.filePicked != null){
-            String ext = FilenameUtils.getExtension(this.filePicked.getPath());
-            int type = 2;
-            switch (ext) {
-                case "png":
-                case "gif":
-                case "jpeg":
-                case "svg":
-                case "jpg":
-                    type = 3;
-                    break;
+            //We send the File if the filed is not null
+            if (this.filePicked != null) {
+                String ext = FilenameUtils.getExtension(this.filePicked.getPath());
+                int type = 2;
+                switch (ext) {
+                    case "png":
+                    case "gif":
+                    case "jpeg":
+                    case "svg":
+                    case "jpg":
+                        type = 3;
+                        break;
+                }
+                MessageDisplayFile msgFile = new MessageDisplayFile(model.user.getId(), timeStamp, this.filePicked.getName(), type, this.filePicked, ext, -1);
+                this.listMessages.add(msgFile);
+                this.tcpCo.sendMessageFile(msgFile);
+                this.dbAccess.addMessage(this.localUserId, this.remoteUser.getId(), msgFile);
+                this.filePicked = null;
+                this.labelFile.setVisible(false);
             }
-            MessageDisplayFile msgFile = new MessageDisplayFile(model.user.getId(),timeStamp,this.filePicked.getName(),type,this.filePicked, ext, -1);
-            this.listMessages.add(msgFile);
-            this.tcpCo.sendMessageFile(msgFile);
-            this.dbAccess.addMessage(this.localUserId,this.remoteUser.getId(),msgFile);
-            this.filePicked = null;
-            this.labelFile.setVisible(false);
-        }
-        this.sendButton.setDisable(false);
-        int size = messageList.getItems().size();
-        messageList.scrollTo(size - 1);
+            this.sendButton.setDisable(false);
+            int size = messageList.getItems().size();
+            messageList.scrollTo(size - 1);
     }
 
     /**