diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 16:50:18 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-11 16:50:18 +0300 |
| commit | b362668f8144f07b2bd388ccae4d52dca1590396 (patch) | |
| tree | b259266ade960e65cc1021669b34b5c326650620 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | |
| parent | 39849c2c572e23341d3fda260e72d4fc8367a68d (diff) | |
| parent | 26a73724548797cec791ea4b622e5e8baea06980 (diff) | |
| download | open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.tar.gz open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.tar.bz2 open-keychain-b362668f8144f07b2bd388ccae4d52dca1590396.zip | |
Merge pull request #1865 from vanitasvitae/master
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) { |