diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-07 02:19:03 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
| commit | 007d02f01b1381d218a248a377e186b4549a5e0e (patch) | |
| tree | 7231d735cf25cd9883557307f43e422551a43d0b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | |
| parent | a6cb330dafa5fccdd92376502cb6624b9dc72df6 (diff) | |
| download | open-keychain-007d02f01b1381d218a248a377e186b4549a5e0e.tar.gz open-keychain-007d02f01b1381d218a248a377e186b4549a5e0e.tar.bz2 open-keychain-007d02f01b1381d218a248a377e186b4549a5e0e.zip | |
added proxy support, silent right now
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 3 |
1 files changed, 2 insertions, 1 deletions
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())); |