aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-06 15:26:22 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-03 20:46:15 +0530
commit3034db0f71f9dd8e2f4d8838c1803952702f7520 (patch)
treecb13212845cc5159516a2a0e87b0f3439acfc5ec /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
parentf4f3a66d8c1d6a3b863eb7a7a6cb47a995609872 (diff)
downloadopen-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.gz
open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.bz2
open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.zip
added proxy type
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 048fbf327..045ef347c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -98,12 +98,7 @@ public final class Constants {
public static final String USE_TOR_PROXY = "useTorProxy";
public static final String PROXY_HOST = "proxyHost";
public static final String PROXY_PORT = "proxyPort";
- }
-
- public static final class ProxyOrbot {
- public static final String PROXY_HOST = "127.0.0.1";
- public static final int PROXY_HTTP_PORT = 8118;
- public static final int PROXY_SOCKS_PORT = 9050;
+ public static final String PROXY_TYPE = "proxyType";
}
public static final class Defaults {