Fix proxy settings

jordeu · jordeu · commit 580cd45ef786 · 2014-10-20T14:14:50.000+02:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/genomespace/dm/HttpUtils.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/genomespace/dm/HttpUtils.java
@@ -443,8 +443,15 @@ private HttpURLConnection openConnection(URL url, Map<String, String> requestPro
 
     private HttpURLConnection openConnection(URL url, Map<String, String> requestProperties, String method, int redirectCount) throws IOException {
 
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        Object proxyHost = System.getProperties().get("http.proxyHost");
+        Object proxyPort = System.getProperties().get("http.proxyPort");
 
+        Proxy proxy = Proxy.NO_PROXY;
+        if (proxyHost != null && proxyPort != null && proxyPort instanceof Integer) {
+            proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost.toString(), (Integer) proxyPort));
+        }
+
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection(proxy);
 
         if (GSUtils.isGenomeSpace(url)) {
             String token = GSUtils.getGSToken();
diff --git a/org.gitools.ui.core/src/main/java/org/gitools/ui/core/Application.java b/org.gitools.ui.core/src/main/java/org/gitools/ui/core/Application.java
@@ -214,7 +214,7 @@ boolean isNewerGitoolsAvailable() throws Exception {
         con.setConnectTimeout(1000);
         con.setReadTimeout(1000);
 
-        BufferedReader in = new BufferedReader(new InputStreamReader(latestUrl.openStream()));
+        BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
 
         String latestVersion;
         latestVersion = in.readLine();
