diff options
| author | Jonathan Bauer | 2015-08-28 16:05:39 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-08-28 16:05:39 +0200 |
| commit | 6edfeb77d6e21d5060a86a91684634f3472e7911 (patch) | |
| tree | f3a253fbdb5ad3087c9792e31b895295890cfdcb /dozentenmodul | |
| parent | Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff) | |
| download | tutor-module-6edfeb77d6e21d5060a86a91684634f3472e7911.tar.gz tutor-module-6edfeb77d6e21d5060a86a91684634f3472e7911.tar.xz tutor-module-6edfeb77d6e21d5060a86a91684634f3472e7911.zip | |
[client] version check in initSession
Diffstat (limited to 'dozentenmodul')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index ddac7c67..2da68dec 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -42,6 +42,7 @@ import org.openslx.dozmod.gui.Gui.GuiCallable; import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.helper.QFileChooser; +import org.openslx.sat.thrift.version.Version; import org.openslx.thrifthelper.ThriftManager; import org.openslx.util.QuickTimer; import org.openslx.util.QuickTimer.Task; @@ -83,6 +84,7 @@ public class ThriftActions { } } else { // after login + // TODO sat adress selection popup!! address = "132.230.8.113"; satToken = data.satelliteToken; masterToken = data.masterToken; @@ -93,6 +95,22 @@ public class ThriftActions { if (client == null) return false; + // check our version + long remoteVersion = 0; + try { + remoteVersion = client.getVersion(); + } catch (TException e) { + LOGGER.debug("Failed to retrieve remote version: ", e); + return false; + } + if (remoteVersion != Version.VERSION) { + Gui.showMessageBox(frame, + "Das von Ihnen verwendete Dozentenmodul ist nicht mit dem Satelliten-Server kompatibel.\n" + + "Ihre Version: " + Version.VERSION + "\n" + + "Satelliten-Version: " + remoteVersion, + MessageType.ERROR, LOGGER, null); + return false; + } // all good, try to get the whoami info try { whoami = client.whoami(satToken); |