From e6b7722471ed2ea310c7f12f4b3ee10da78735f2 Mon Sep 17 00:00:00 2001
From: Nabzzz <n.moukhlis@gmail.com>
Date: Sun, 17 Jan 2021 11:31:47 +0100
Subject: [PATCH] SendPost fonctionnelle

---
 .../compileJava/source-classes-mapping.txt    | 18 ++++++++-------
 .../main/java/chatapp/Controller/ChatApp.java | 22 ++++++++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
index 32b6076..5e28384 100644
--- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
+++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
@@ -1,24 +1,24 @@
 chatapp/Launcher.java
  chatapp.Launcher
-chatapp/Model/Utilisateur.java
- chatapp.Model.Utilisateur
+chatapp/Model/ListUtilisateurs.java
+ chatapp.Model.ListUtilisateurs
 chatapp/Model/MessageHorodate.java
  chatapp.Model.MessageHorodate
 chatapp/Model/DataBase.java
  chatapp.Model.DataBase
+chatapp/Model/Utilisateur.java
+ chatapp.Model.Utilisateur
 chatapp/Protocol/RunnerEcouteTCP.java
  chatapp.Protocol.RunnerEcouteTCP
 chatapp/View/FenetreSession.java
  chatapp.View.FenetreSession
  chatapp.View.FenetreSession$1
-chatapp/Controller/ChatApp.java
- chatapp.Controller.ChatApp
+chatapp/View/DemarrerSession.java
+ chatapp.View.DemarrerSession
 chatapp/View/ChangementPseudo.java
  chatapp.View.ChangementPseudo
 chatapp/Protocol/RunnerEcouteUDP.java
  chatapp.Protocol.RunnerEcouteUDP
-chatapp/Model/ListUtilisateurs.java
- chatapp.Model.ListUtilisateurs
 chatapp/Protocol/UDPEchange.java
  chatapp.Protocol.RunnerUDP
  chatapp.Protocol.UDPEchange
@@ -35,5 +35,7 @@ chatapp/View/View_Utilisateurs.java
  chatapp.View.View_Utilisateurs
 chatapp/View/View_Menu.java
  chatapp.View.View_Menu
-chatapp/View/DemarrerSession.java
- chatapp.View.DemarrerSession
+chatapp/Controller/ChatApp.java
+ chatapp.Controller.ChatApp
+chatapp/Protocol/HttpEchange.java
+ chatapp.Protocol.HttpEchange
diff --git a/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java b/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java
index 0c4bb64..e5ff548 100644
--- a/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java
+++ b/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java
@@ -3,10 +3,7 @@ package chatapp.Controller;
 import chatapp.Model.DataBase;
 import chatapp.Model.ListUtilisateurs;
 import chatapp.Model.Utilisateur;
-import chatapp.Protocol.RunnerEcouteTCP;
-import chatapp.Protocol.RunnerEcouteUDP;
-import chatapp.Protocol.SessionClavardage;
-import chatapp.Protocol.UDPEchange;
+import chatapp.Protocol.*;
 import javafx.application.Application;
 import javafx.application.Platform;
 import java.beans.PropertyChangeEvent;
@@ -32,6 +29,7 @@ public class ChatApp implements PropertyChangeListener {
     private ListUtilisateurs actifUsers ;
 
     private boolean isExterne; // TRUE si l'utilisateur est externe au reseau FALSE s'il est interne
+    private HttpEchange externeEchange;
     /* ChatApp est associe a un utilisateur */
     private Utilisateur me;
 
@@ -60,10 +58,10 @@ public class ChatApp implements PropertyChangeListener {
         InetAddress ip = UDPEchange.getCurrentIp();
         this.me = new Utilisateur(pseudo,port,ip);
         this.actifUsers.addList(getMe());
-
         this.main = main;
         this.db= DataBase.getInstance();
         this.connecte=false;
+        this.externeEchange = new HttpEchange(this);
     }
 
     /**
@@ -162,7 +160,14 @@ public class ChatApp implements PropertyChangeListener {
      */
     public boolean connexion(String pseudo) throws IOException{
         if(this.isExterne()){
-            return this.connexionExterne(pseudo);
+            try {
+                System.out.println("Demande de connexion distante");
+                return this.connexionExterne(pseudo);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                return false;
+            }
+
         }
         else{
             return connexionInterne(pseudo);
@@ -176,8 +181,9 @@ public class ChatApp implements PropertyChangeListener {
      * @return  False si Connexion a echoue, True sinon
      * @throws IOException
      */
-    private boolean connexionExterne(String pseudo) {
-        return false;
+    private boolean connexionExterne(String pseudo) throws IOException, InterruptedException{
+        this.me.setPseudo(pseudo);
+        return externeEchange.sendPost("Connexion");
     }