Commit 33ec9da9 authored by legoc's avatar legoc

Client type is passed at login

parent 1ddac008
......@@ -140,7 +140,7 @@
<dependency>
<groupId>fr.ill.ics</groupId>
<artifactId>nomadcommandsystem</artifactId>
<version>4.0.27</version>
<version>4.0.30-beta</version>
</dependency>
<dependency> <!-- For CollectionUtils -->
<groupId>org.apache.commons</groupId>
......
......@@ -104,9 +104,9 @@ public class RemoteControlManager {
public void onremoteClick() {
if (remoteControlState.isAuthorized()) {
SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).disableRemoteControl(ConfigManager.getInstance().getClientType());
SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).disableRemoteControl();
} else {
SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).enableRemoteControl(ConfigManager.getInstance().getClientType());
SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).enableRemoteControl();
}
}
......
......@@ -30,7 +30,7 @@ public class FreeTokenState extends TokenState {
@Override
public void onTokenClick() {
fr.ill.ics.bridge.TokenManager.getInstance().askForToken(ConfigManager.getInstance().getClientType());
fr.ill.ics.bridge.TokenManager.getInstance().askForToken();
}
@Override
......
......@@ -34,7 +34,7 @@ public class OwnedByOtherTokenState extends TokenState {
if (ConfigManager.getInstance().isRemoteClient()) {
DialogManager.getInstance().nomadMessageDialog(ConfigManager.getInstance().getString("multiClient.tokenOwnedByOtherShortMessage"), "");
} else {
fr.ill.ics.bridge.TokenManager.getInstance().askForToken(ConfigManager.getInstance().getClientType());
fr.ill.ics.bridge.TokenManager.getInstance().askForToken();
}
}
......
......@@ -207,6 +207,6 @@ public class TokenManager implements TokenEventListener {
}
}).start();
// Request token
SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).requestToken(ConfigManager.getInstance().getClientType());
SessionManager.getInstance(CommandZoneWrapper.SERVER_ID).requestToken();
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment