Merge

build/libs/config.properties

@@ -3,15 +3,15 @@
 # For more information, visit https://www.etud.insa-toulouse.fr/~tali/DownloadPageJigglyMessenger/
 
 # The broadcast address of the local network
-app.localNetIPAddress=10.1.5.255
+app.localNetIPAddress=192.168.1.255
 # Port number use by the application (more than 1024)
 app.udpPortNumber=12345
 # Servlet URL : DON'T FORGET THE LAST "/"
-app.servletURL=https://srv-gei-tomcat.insa-toulouse.fr/ServletJiggly/
+app.servletURL=http://192.168.1.18:8080/Gradle___com_example___ServeurClavardage_1_0_SNAPSHOT_war/
 # The Database Address (URL or IP)
-app.dataBaseAddress=srv-bdens.insa-toulouse.fr
-app.dataBaseUser=tp_servlet_013
+app.dataBaseAddress=192.168.1.18
+app.dataBaseUser=root
 # The Database user password
-app.dataBasePasswd=eiN3ahng
+app.dataBasePasswd=0000
 # The Database name
-app.dataBaseName=tp_servlet_013
+app.dataBaseName=testDBChat

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

@@ -67,6 +67,7 @@ public class Model implements PropertyChangeListener{
      * Vrai si pseudo ok, faux sinon
      */
     private boolean isPseudoOk = true;
+    private boolean configure;
 
 
     /**
@@ -89,6 +90,7 @@ public class Model implements PropertyChangeListener{
     public Model(String addrBroadcast, int portListening, Application app, String addrBdd, String userBdd, String mdpBdd, String nomBdd, String urlServeur) {
         this.addrBroadcast = addrBroadcast;
         this.portListening = portListening;
+        this.configure = false;
 
         try {
             this.user = new Utilisateurs("NA", InetAddress.getLocalHost(), 0, 0);
@@ -148,6 +150,11 @@ public class Model implements PropertyChangeListener{
 
         this.openInputUDP();
         this.openTCPListener();
+        this.configure = true;
+    }
+
+    public boolean isConfigured() {
+        return this.configure;
     }
 
 

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

@@ -171,7 +171,9 @@ public class ConnectionScreenController implements Initializable, PropertyChange
                 if (this.isOutdoor) {
                     this.model.choosePseudoOutdoor(pseudo,true,true);
                 } else {
-                    model.configModelIndoor();
+                    if (!model.isConfigured()) {
+                        model.configModelIndoor();
+                    }
                     this.model.choosePseudo(pseudo,true,true);
                 }
             } else {
@@ -206,7 +208,9 @@ public class ConnectionScreenController implements Initializable, PropertyChange
                 if (this.isOutdoor) {
                     this.model.choosePseudoOutdoor(pseudoUp,true,true);
                 } else {
-                    model.configModelIndoor();
+                    if (!model.isConfigured()) {
+                        model.configModelIndoor();
+                    }
                     this.model.choosePseudo(pseudoUp,true,true);
                 }
             }
@@ -216,6 +220,8 @@ public class ConnectionScreenController implements Initializable, PropertyChange
                 this.isSubmittingUp = false;
             }
         }
+        this.signInButton.setDisable(false);
+        this.signUpButton.setDisable(false);
     }
 
     /**