From 007d02f01b1381d218a248a377e186b4549a5e0e Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Sun, 7 Jun 2015 02:19:03 +0530
Subject: added proxy support, silent right now

---
 .../main/java/org/sufficientlysecure/keychain/util/Preferences.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index 7c8e5f1ce..ab33f30bf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -306,7 +306,8 @@ public class Preferences {
         boolean useNormalProxy = getUseNormalProxy();
 
         if (useTor) {
-            proxy = Constants.Orbot.PROXY;
+            proxy = new Proxy(Constants.Orbot.PROXY_TYPE,
+                    new InetSocketAddress(Constants.Orbot.PROXY_HOST, Constants.Orbot.PROXY_PORT));
         }
         else if (useNormalProxy) {
             proxy = new Proxy(getProxyType(), new InetSocketAddress(getProxyHost(), getProxyPort()));
-- 
cgit v1.2.3