src/main/java/fr/insa/clavardator/network/ConnectionListener.java

@@ -54,7 +54,9 @@ public class ConnectionListener {
 			try {
 				server = new ServerSocket(TCP_PORT);
 				while (!shouldStop) {
+					System.out.println("Accepting...");
 					Socket clientSocket = server.accept();
+					System.out.println("New connection from " + clientSocket.getRemoteSocketAddress());
 					callback.onNewConnection(clientSocket);
 				}
 			} catch (IOException e) {

src/main/java/fr/insa/clavardator/network/NetUtil.java

@@ -41,13 +41,4 @@ public class NetUtil {
 		}
 		return localList;
 	}
-
-	public static int getIdFromIp(InetAddress ipAddr) {
-		byte[] addr = ipAddr.getAddress();
-		int id = 0;
-		for (byte b : addr) {
-			id = (id << 8) + b;
-		}
-		return id;
-	}
 }

src/main/java/fr/insa/clavardator/ui/MainController.java

@@ -100,17 +100,9 @@ public class MainController implements Initializable {
 		}
 	}
 
-	private void startListening() {
-		if (userList != null) {
-			userList.startDiscoveryListening();
-			userList.startUserListening((e) ->
-					Log.e(this.getClass().getSimpleName(), "Error listening to users", e));
-		}
-	}
-
 	private void startChat() {
 		discoverActiveUsers();
-		startListening();
+		userList.startDiscoveryListening();
 		Platform.runLater(this::showChat);
 	}
 

src/main/java/fr/insa/clavardator/users/CurrentUser.java

@@ -9,8 +9,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static fr.insa.clavardator.network.NetUtil.getIdFromIp;
-
 public class CurrentUser extends User {
 	private static CurrentUser instance = null;
 
@@ -33,11 +31,10 @@ public class CurrentUser extends User {
 	public void init() throws SocketException {
 		final List<InetAddress> addresses = NetUtil.listAllLocalAddresses();
 		if (addresses.size() > 0) {
-			id = getIdFromIp(addresses.get(0));
+			id = addresses.get(0).hashCode();
 		} else {
 			throw new SocketException();
 		}
-		setUsername("Moi2");
 		// TODO place by db username fetching
 		Timer t = new Timer();
 		t.schedule(new TimerTask() {

src/main/java/fr/insa/clavardator/users/UserList.java

@@ -13,8 +13,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Predicate;
 
-import static fr.insa.clavardator.network.NetUtil.getIdFromIp;
-
 public class UserList {
 
 	private final Map<Integer, PeerUser> inactiveUsers = new HashMap<>();
@@ -141,6 +139,16 @@ public class UserList {
 		}
 	}
 
+	private int getIdFromIp(InetAddress ipAddr) {
+		byte[] addr = ipAddr.getAddress();
+		int id = 0;
+		for (byte b : addr) {
+			id = (id << 8) + b;
+		}
+		return id;
+	}
+
+
 	public void addActiveUsersObserver(UserConnectionCallback connectionCallback, UserDisconnectionCallback disconnectionCallback) {
 		userConnectionObservers.add(connectionCallback);
 		userDisconnectionObservers.add(disconnectionCallback);