[client] done TODO: if SSL with masterserver is not available, ask him if he wants to connect w/o SSL and if he chooses yes, do so

1 files changed, 13 insertions, 7 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index cee3a587..d7c9539f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -151,10 +151,8 @@ public class App {
 		// Adjust font size
 		adjustFontSize(Config.getFontScaling());
 
-		// setup global thrift connection error handler before anything else
-		// Set master server to use
-		String host;
-		int port;
+		final String host;
+		final int port;
 		boolean useSsl;
 		if (args.length == 3) {
 			host = args[0];
@@ -174,16 +172,24 @@ public class App {
 				SwingUtilities.invokeLater(new Runnable() {
 					@Override
 					public void run() {
-						Gui.showMessageBox(null, "SSL nicht verfügbar", MessageType.ERROR, LOGGER, e1);
-						// TODO: Ask if user wants to establish plain connection, quit otherwise
-						System.exit(1);
+						boolean ret = Gui.showMessageBox(null, "SSL nicht verfügbar. Wollen Sie sich trotzdem unverschlüsselt verbinden?", MessageType.QUESTION_YESNO, LOGGER, e1);
+						if (ret) {
+							connectAndRun(null, host, THRIFT_PORT);
+						} else {
+							System.exit(1);
+						}
 					}
 				});
 				return;
 			}
+			connectAndRun(ctx, host, port);
 		}
+	}
+	public static void connectAndRun(SSLContext ctx, String host, int port) {
+		// Set master server to use
 		ThriftManager.setMasterServerAddress(ctx, host, port, THRIFT_TIMEOUT_MS);
 
+		// setup global thrift connection error handler before anything else
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override
 			public void run() {