1 files changed, 10 insertions, 2 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 34995b41..40c198ac 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
@@ -4,12 +4,14 @@ import java.awt.Frame;
 import java.awt.Window;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import javax.net.ssl.SSLContext;
 import javax.swing.JFileChooser;
 
 import org.apache.logging.log4j.LogManager;
@@ -406,10 +408,12 @@ public class ThriftActions {
 				TException transEx = null;
 				String transHost = null;
 				TransferInformation transInf = null;
+				SSLContext sslContext = null;
 				try {
 					transInf = ThriftManager.getSatClient().requestDownload(Session.getSatelliteToken(),
 							imageVersionId);
 					transHost = Session.getSatelliteAddress();
+					sslContext = ThriftManager.getSatelliteSslContext();
 				} catch (TException e) {
 					transEx = e;
 				}
@@ -420,6 +424,10 @@ public class ThriftActions {
 						transInf = ThriftManager.getMasterClient().downloadImage(Session.getSatelliteToken(),
 								imageVersionId);
 						transHost = App.getMasterServerAddress();
+						try {
+							sslContext = SSLContext.getDefault();
+						} catch (NoSuchAlgorithmException e) {
+						}
 					} catch (TException e) {
 						transEx = e;
 					}
@@ -436,8 +444,8 @@ public class ThriftActions {
 				final TransferInformation fTransInf = transInf;
 				final DownloadTask dlTask;
 				try {
-					dlTask = new DownloadTask(fTransHost, transInf.getPlainPort(),
-							transInf.getToken(), tmpDiskFile, imageSize, null);
+					dlTask = new DownloadTask(fTransHost, transInf,
+							sslContext, tmpDiskFile, imageSize, null);
 				} catch (FileNotFoundException e) {
 					Gui.asyncMessageBox(I18n.THRIFT.getString("ThriftActions.Message.error.destinationNotWritable"),
 							MessageType.ERROR, LOGGER, e);