[tor-commits] [tor-browser/tor-browser-52.7.2esr-8.0-1] for #4, ensure proxy settings are respected everywhere

[gk@xxxxxxxxxxxxxx]

commit 9f121dad020ce4dbda882df9b75e3b1a25e6985a
Author: n8fr8 <nathan@xxxxxxxxxxx>
Date:   Tue Aug 1 17:16:48 2017 -0400

    for #4, ensure proxy settings are respected everywhere
    
    Signed-off-by: Amogh Pradeep <amoghbl1@xxxxxxxxx>
---
 .../src/main/java/org/mozilla/gecko/util/ProxySelector.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index 35010242b22d..6fe87271c825 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -30,6 +30,9 @@ import java.util.List;
 
 public class ProxySelector {
     public static URLConnection openConnectionWithProxy(URI uri) throws IOException {
+
+	//Orfox: Ignore system and use Orbot/Tor
+	/**
         java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
         Proxy proxy = Proxy.NO_PROXY;
         if (ps != null) {
@@ -38,8 +41,9 @@ public class ProxySelector {
                 proxy = proxies.get(0);
             }
         }
+	**/
 
-        return uri.toURL().openConnection(proxy);
+	return uri.toURL().openConnection(ProxySettings.getProxy());
     }
 
     public ProxySelector() {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits