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

Compare commits

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

2 commits
ede9b259d4 ... 93cf550a9b

Author SHA1 Message Date
Arnaud Vergnet
93cf550a9b Do not reject presence server user if local inactive 2021-01-12 10:37:14 +01:00
Arnaud Vergnet
bc50fdec44 Update server ports 2021-01-12 10:36:21 +01:00
2 changed files with 9 additions and 3 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": 123456789, "presence": 35650,
"proxy": 987654321 "proxy": 35750
} }
} }
} }

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

@ -49,8 +49,14 @@ 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) {
Log.v(getClass().getSimpleName(), "Received user from presence server already known"); if (savedUser.isActive()) {
Log.v(getClass().getSimpleName(), "Received user from presence server already known and connected");
} else {
Log.v(getClass().getSimpleName(), "Received user from presence server already known and connected");
savedUser.init(proxyConnection, userInfo.id, userInfo.getUsername(), null);
}
} else { } 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);