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

Add logs when user change state

Browse source
This commit is contained in:
Yohan Simard 2020-12-16 12:21:50 +01:00
parent 1d3e56e9b7
commit 206003080a
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log; import fr.insa.clavardator.util.Log;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -110,16 +109,18 @@ public class UserList {
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.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an already connected user: user id " + id);
return;
} else { } else {
Log.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an unknown user: user id " + id); Log.e(getClass().getSimpleName(), "Tried to set state CONNECTED on an unknown user: user id " + id);
return;
} }
return;
} }
inactiveUsers.remove(id); inactiveUsers.remove(id);
activeUsers.put(id, user); activeUsers.put(id, user);
notifyConnectionObservers(user); notifyConnectionObservers(user);
Log.v(getClass().getSimpleName(), "State of user " + id + " updated from " +
oldState.toString() + " to " + newState.toString());
} else if (oldState == PeerUser.State.CONNECTED && } else if (oldState == PeerUser.State.CONNECTED &&
(newState == PeerUser.State.DISCONNECTED || newState == PeerUser.State.CONNECTING)) { (newState == PeerUser.State.DISCONNECTED || newState == PeerUser.State.CONNECTING)) {
@ -127,16 +128,18 @@ public class UserList {
if (!activeUsers.containsKey(id)) { if (!activeUsers.containsKey(id)) {
if (inactiveUsers.containsKey(id)) { if (inactiveUsers.containsKey(id)) {
Log.e(getClass().getSimpleName(), "Tried to set state DISCONNECTED on an already disconnected user: user id " + id); Log.e(getClass().getSimpleName(), "Tried to set state DISCONNECTED on an already disconnected user: user id " + id);
return;
} else { } else {
Log.e(getClass().getSimpleName(), "Tried to set state DISCONNECTED on an unknown user: user id " + id); Log.e(getClass().getSimpleName(), "Tried to set state DISCONNECTED on an unknown user: user id " + id);
return;
} }
return;
} }
activeUsers.remove(id); activeUsers.remove(id);
inactiveUsers.put(id, user); inactiveUsers.put(id, user);
notifyDisconnectionObservers(user); notifyDisconnectionObservers(user);
Log.v(getClass().getSimpleName(), "State of user " + id + " updated from " +
oldState.toString() + " to " + newState.toString());
} }
} }
} }