Merge pull request #187 from mvdnes/ssl_trust_key

Fix always failing SSL with empty sslTrustKey string
9 years ago · 4ce5023c82
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/org/transdroid/daemon/util/HttpHelper.java
+++ b/app/src/main/java/org/transdroid/daemon/util/HttpHelper.java
@ -130,7 +130,7 @@ public class HttpHelper {
				@@ -130,7 +130,7 @@ public class HttpHelper {
 		// Register http and https sockets
 		SchemeRegistry registry = new SchemeRegistry();
 		SocketFactory httpsSocketFactory;
-		if (sslTrustKey != null) {
+		if (sslTrustKey != null && sslTrustKey.length() != 0) {
 			httpsSocketFactory = new TlsSniSocketFactory(sslTrustKey);
 		} else if (sslTrustAll) {
 			httpsSocketFactory = new TlsSniSocketFactory(true);