aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-07-18 09:56:39 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-07-18 09:56:39 +0200
commita10f582513bf9b2a75fb3049d91fde4cf92c1d04 (patch)
tree953700e35e54495e606faa1248736e0abd7ca9b9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
parentd8ada7c1bb39e9eb93c8de5534dfe443b6f53c82 (diff)
parent94e56a4542759948a862011e5a727db927918f43 (diff)
downloadopen-keychain-a10f582513bf9b2a75fb3049d91fde4cf92c1d04.tar.gz
open-keychain-a10f582513bf9b2a75fb3049d91fde4cf92c1d04.tar.bz2
open-keychain-a10f582513bf9b2a75fb3049d91fde4cf92c1d04.zip
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java1
1 files changed, 1 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 686a53f5b..33ab52bca 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -68,6 +68,7 @@ public final class Constants {
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 String CONCEAL_PGP_APPLICATION = "concealPgpApplication";
public static final String FIRST_TIME = "firstTime";
}