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

Compare commits

base: vergnet:93cf550a9b4777c9fc1fb4777f8f983b455a7b32
Branches Tags
vergnet:master
vergnet:subprojects
..
compare: vergnet:ede9b259d44b092e375f8f35456ebcffbb1c5aac
Branches Tags
vergnet:master
vergnet:subprojects

No commits in common. "93cf550a9b4777c9fc1fb4777f8f983b455a7b32" and "ede9b259d44b092e375f8f35456ebcffbb1c5aac" have entirely different histories.
93cf550a9b ... ede9b259d4

2 changed files with 3 additions and 9 deletions
Show stats Expand all files Collapse all files

4
config.json
View file

@ -4,8 +4,8 @@
"uri": "test", "uri": "test",
"type": "INSA", "type": "INSA",
"ports": { "ports": {
"presence": 35650, "presence": 123456789,
"proxy": 35750 "proxy": 987654321
} }
} }
} }

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

@ -49,14 +49,8 @@ public class UserList {
newPresenceUsers.forEach((userInfo -> { newPresenceUsers.forEach((userInfo -> {
final PeerUser savedUser = userHashmap.get(userInfo.id); final PeerUser savedUser = userHashmap.get(userInfo.id);
if (savedUser != null) { if (savedUser != null) {
if (savedUser.isActive()) { Log.v(getClass().getSimpleName(), "Received user from presence server already known");
Log.v(getClass().getSimpleName(), "Received user from presence server already known and connected");
} else { } else {
Log.v(getClass().getSimpleName(), "Received user from presence server already known and connected");
savedUser.init(proxyConnection, userInfo.id, userInfo.getUsername(), null);
}
} else {
Log.v(getClass().getSimpleName(), "Received new user from presence server");
final PeerUser user = new PeerUser(); final PeerUser user = new PeerUser();
user.init(proxyConnection, userInfo.id, userInfo.getUsername(), null); user.init(proxyConnection, userInfo.id, userInfo.getUsername(), null);
userHashmap.put(user.id, user); userHashmap.put(user.id, user);