vergnet/clavardator
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix user duplication on new session start

Browse source
This commit is contained in:
Arnaud Vergnet 2020-12-16 18:20:56 +01:00
parent 1fe1681d8b
commit 7075c9e0b6
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/fr/insa/clavardator/users/UserList.java
View file

@ -40,10 +40,8 @@ public class UserList {
Log.v(this.getClass().getSimpleName(), "Discovered new user: " + id); Log.v(this.getClass().getSimpleName(), "Discovered new user: " + id);
final PeerUser finalUser = createNewUser(id); final PeerUser finalUser = createNewUser(id);
if (finalUser != null) { if (finalUser != null) {
finalUser.connect(ipAddr, () -> { finalUser.connect(ipAddr, () ->
notifyNewUserObservers(finalUser); finalUser.addObserver(evt -> userChangeObserver(finalUser, evt)), errorCallback);
finalUser.addObserver(evt -> userChangeObserver(finalUser, evt));
}, errorCallback);
} }
}, errorCallback); }, errorCallback);
} }
@ -62,10 +60,8 @@ public class UserList {
Log.v(this.getClass().getSimpleName(), "new connection from user: " + id); Log.v(this.getClass().getSimpleName(), "new connection from user: " + id);
final PeerUser finalUser = createNewUser(id); final PeerUser finalUser = createNewUser(id);
if (finalUser != null) { if (finalUser != null) {
finalUser.connect(clientSocket, () -> { finalUser.connect(clientSocket, () ->
notifyNewUserObservers(finalUser); finalUser.addObserver(evt -> userChangeObserver(finalUser, evt)), errorCallback);
finalUser.addObserver(evt -> userChangeObserver(finalUser, evt));
}, errorCallback);
} }
}, },
errorCallback); errorCallback);
@ -84,8 +80,9 @@ public class UserList {
// else create it // else create it
if (user == null) { if (user == null) {
// Username is set on TCP connection start // Username is set on TCP connection start
user = new PeerUser(id, ""); user = new PeerUser(id);
inactiveUsers.put(id, user); inactiveUsers.put(id, user);
notifyNewUserObservers(user);
} }
return user; return user;
@ -103,9 +100,9 @@ public class UserList {
// Connection handling // Connection handling
if (!inactiveUsers.containsKey(id)) { if (!inactiveUsers.containsKey(id)) {
if (activeUsers.containsKey(id)) { if (activeUsers.containsKey(id)) {
Log.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an already connected user: user id " + id); Log.w(getClass().getSimpleName(), "Tried to set state CONNECTED on an already connected user: user id " + id);
} else { } else {
Log.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an unknown user: user id " + id); Log.w(getClass().getSimpleName(), "Tried to set state CONNECTED on an unknown user: user id " + id);
} }
return; return;
} }