[client] Fully async proxy detection (no more GUI freezes)

1 files changed, 5 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 8351ab89..c0c68b55 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -15,7 +15,6 @@ import java.util.List;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.Organization;
@@ -50,7 +49,6 @@ public class LoginWindow extends LoginWindowLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(LoginWindow.class);
 
-	// TODO This has nothing to to with the layout
 	public static enum LoginType {
 		ECP(0),
 		TEST_ACCOUNT(1),
@@ -161,7 +159,7 @@ public class LoginWindow extends LoginWindowLayout {
 			public void keyReleased(KeyEvent e) {
 				super.keyReleased(e);
 				if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-					doLogin();
+					loginButton.doClick();
 				}
 			}
 		};
@@ -232,8 +230,8 @@ public class LoginWindow extends LoginWindowLayout {
 	private void doLogin() {
 		// sanity check on loginType.
 		if (loginType == null) {
-			Gui.showMessageBox(this, "Bitte wählen Sie eine Authentifizierungsart.",
-					MessageType.ERROR, LOGGER, null);
+			Gui.showMessageBox(this, "Bitte wählen Sie eine Authentifizierungsart.", MessageType.ERROR,
+					LOGGER, null);
 			return;
 		}
 		if (loginType == LoginType.ECP && idpCombo.getSelectedIndex() == -1) {
@@ -313,6 +311,7 @@ public class LoginWindow extends LoginWindowLayout {
 		}
 
 		// Excute login
+		App.waitForInit();
 		try {
 			authenticator.login(username, password, authenticatorCallback);
 		} catch (Exception e) {
@@ -329,7 +328,7 @@ public class LoginWindow extends LoginWindowLayout {
 	private void postSuccessfulLogin(AuthenticationData data) {
 		LOGGER.info(loginType.toString() + " succeeded, token " + data.satelliteToken);
 		// now try to init the session with the data received
-		if (ThriftActions.initSession(JOptionPane.getFrameForComponent(this), data)) {
+		if (ThriftActions.initSession(data)) {
 			if (saveUsernameCheck.isSelected()) {
 				Config.saveCurrentSession(Session.getSatelliteAddress(), Session.getSatelliteToken(),
 						Session.getMasterToken());