aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-15 10:20:01 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-15 10:20:01 +0200
commit67e572cf4f65fa8e643825cd4ec75f03951a5dd7 (patch)
tree15e0b3cc73d8681036b82fab3b2599e79ce5cfb1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
parent53bc417f8f77a9f92786457281d02431ef614ca7 (diff)
parentba7ef28ade4161ebecf8db7271114d96d9ae0595 (diff)
downloadopen-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.tar.gz
open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.tar.bz2
open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index ab1c6a462..67ab156a8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -82,6 +82,8 @@ public final class Constants {
public static final String CACHED_CONSOLIDATE = "cachedConsolidate";
public static final String CACHED_CONSOLIDATE_SECRETS = "cachedConsolidateSecrets";
public static final String CACHED_CONSOLIDATE_PUBLICS = "cachedConsolidatePublics";
+ public static final String SEARCH_KEYSERVER = "search_keyserver_pref";
+ public static final String SEARCH_KEYBASE = "search_keybase_pref";
public static final String USE_DEFAULT_YUBIKEY_PIN = "useDefaultYubikeyPin";
}