From 2a60b0680335048f1f4d7f101f57a705631bbf67 Mon Sep 17 00:00:00 2001
From: Alexandr Savchuk <a.u.savchuk@gmail.com>
Date: Fri, 6 Sep 2013 20:03:53 +0400
Subject: [PATCH] Implement support of HTTPS and SOCKS proxy settings

Implement support of HTTPS and SOCKS proxy settings.

If SOCKS proxy and credentials are set up then they are set too.
---
 src/com/opera/core/systems/OperaProxy.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/com/opera/core/systems/OperaProxy.java b/src/com/opera/core/systems/OperaProxy.java
index 38e1a1209..20995f1ef 100644
--- a/src/com/opera/core/systems/OperaProxy.java
+++ b/src/com/opera/core/systems/OperaProxy.java
@@ -305,15 +305,23 @@ public void parse(Proxy proxy) {
         }
         setUsePAC(false);
 
-        // TODO(andreastt): HTTPS proxy
-        // TODO(andreastt): SOCKS proxy
-
         if (proxy.getHttpProxy() != null) {
           setHttpProxy(proxy.getHttpProxy());
         }
         if (proxy.getFtpProxy() != null) {
           setFtpProxy(proxy.getFtpProxy());
         }
+        if (proxy.getSslProxy() != null) {
+          setHttpsProxy(proxy.getSslProxy());
+        }
+        if (proxy.getSocksProxy() != null) {
+          setSocksProxy(proxy.getSocksProxy());
+          if ((proxy.getSocksUsername() != null) && (proxy.getSocksPassword() != null)) {
+            setSocksUsername(proxy.getSocksUsername());
+            setSocksPassword(proxy.getSocksPassword());
+          }
+        }
+        // setup of bypass proxy addresses (noProxy) is not implemented
 
         break;