aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-22 17:02:53 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-22 17:02:53 +0200
commit862c9a8b3ccaadcc712b288b19db49fd5afd533a (patch)
tree0b091ccc9b8f11a6f97788482e1ed6987d7df13a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
parentf6ac887ce0e440d19273889ff10bc1306d8bed50 (diff)
downloadopen-keychain-862c9a8b3ccaadcc712b288b19db49fd5afd533a.tar.gz
open-keychain-862c9a8b3ccaadcc712b288b19db49fd5afd533a.tar.bz2
open-keychain-862c9a8b3ccaadcc712b288b19db49fd5afd533a.zip
log "unspecified" flags differently
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 6856f087d..f8600d9d4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -389,9 +389,17 @@ public class ProviderHelper {
// see above
if (masterKeyId == keyId) {
- log(LOG_TYPES_FLAG_MASTER[(c?1:0) + (e?2:0) + (s?4:0) + (a?8:0)]);
+ if (key.getKeyUsage() == null) {
+ log(LogType.MSG_IP_MASTER_FLAGS_UNSPECIFIED);
+ } else {
+ log(LOG_TYPES_FLAG_MASTER[(c?1:0) + (e?2:0) + (s?4:0) + (a?8:0)]);
+ }
} else {
- log(LOG_TYPES_FLAG_SUBKEY[(c?1:0) + (e?2:0) + (s?4:0) + (a?8:0)]);
+ if (key.getKeyUsage() == null) {
+ log(LogType.MSG_IP_SUBKEY_FLAGS_UNSPECIFIED);
+ } else {
+ log(LOG_TYPES_FLAG_SUBKEY[(c ? 1 : 0) + (e ? 2 : 0) + (s ? 4 : 0) + (a ? 8 : 0)]);
+ }
}
Date creation = key.getCreationTime();