diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
| commit | d1d414c006aa6b7b80b25b34f0c75a92a9603a85 (patch) | |
| tree | 6375bd8a5436c866824190318d10d183d8548ab6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |
| parent | 38823b73a31ae0fb82d7e385c141f1170127c4dd (diff) | |
| parent | a9010045889d307ede37d154b0a2fece566c1845 (diff) | |
| download | open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.gz open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.bz2 open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 8074ad2ee..eeb9fa389 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -68,10 +68,12 @@ public final class Constants { public static final String LANGUAGE = "language"; public static final String FORCE_V3_SIGNATURES = "forceV3Signatures"; public static final String KEY_SERVERS = "keyServers"; + public static final String KEY_SERVERS_DEFAULT_VERSION = "keyServersDefaultVersion"; } public static final class Defaults { - public static final String KEY_SERVERS = "pool.sks-keyservers.net, subkeys.pgp.net, pgp.mit.edu"; + public static final String KEY_SERVERS = "hkps://hkps.pool.sks-keyservers.net, subkeys.pgp.net, hkps://pgp.mit.edu"; + public static final int KEY_SERVERS_VERSION = 2; } public static final class DrawerItems { |