diff options
author | vanitasvitae <vanitasvitae@riseup.net> | 2016-05-11 02:06:21 +0200 |
---|---|---|
committer | vanitasvitae <vanitasvitae@riseup.net> | 2016-05-11 02:06:21 +0200 |
commit | 8e250e0b5d427229abf654944da171960a094738 (patch) | |
tree | 1a0c9b2b6aed016aa0e4e51af90f708a2fdb61de /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | |
parent | c8a0eb3a083c92b654610f34655fed80312a8ef1 (diff) | |
download | open-keychain-8e250e0b5d427229abf654944da171960a094738.tar.gz open-keychain-8e250e0b5d427229abf654944da171960a094738.tar.bz2 open-keychain-8e250e0b5d427229abf654944da171960a094738.zip |
Fixed 'Orbot appears not to be running' (#1792)
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, 3 insertions, 0 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 5f53845d8..2abd53f62 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -34,6 +34,7 @@ import org.sufficientlysecure.keychain.Constants.Pref; import org.sufficientlysecure.keychain.KeychainApplication; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService; +import org.sufficientlysecure.keychain.util.orbot.OrbotStatusReceiver; import java.io.Serializable; import java.net.Proxy; @@ -270,6 +271,8 @@ public class Preferences { boolean useNormalProxy = getUseNormalProxy(); if (useTor) { + //TODO: Replace Constants.Orbot.PROXY_PORT with OrbotStatusReceiver.getProxyPortHttp() + //TODO: in order to always have the actual port Orbot is offering? return new ProxyPrefs(true, false, Constants.Orbot.PROXY_HOST, Constants.Orbot.PROXY_PORT, Constants.Orbot.PROXY_TYPE); } else if (useNormalProxy) { |