diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-22 16:27:42 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-22 16:27:42 +0200 |
| commit | 029ce91670952128b231de7bfd7240a5bc29f056 (patch) | |
| tree | 9ded132cd14528948ce80e1d692d00e1ac0d9c22 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
| parent | 3f39cf92c6f92c3a70aced9369a0452f92836950 (diff) | |
| download | open-keychain-029ce91670952128b231de7bfd7240a5bc29f056.tar.gz open-keychain-029ce91670952128b231de7bfd7240a5bc29f056.tar.bz2 open-keychain-029ce91670952128b231de7bfd7240a5bc29f056.zip | |
show authenticate flag in logs
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.java | 86 |
1 files changed, 64 insertions, 22 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 3da685ff6..767ab588c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -362,40 +362,82 @@ public class ProviderHelper { values.put(Keys.CAN_SIGN, s); values.put(Keys.CAN_AUTHENTICATE, a); values.put(Keys.IS_REVOKED, key.isRevoked()); + if (masterKeyId == keyId) { - if (c) { - if (e) { - log(s ? LogType.MSG_IP_MASTER_FLAGS_CES - : LogType.MSG_IP_MASTER_FLAGS_CEX); + // yes it's ugly. got any better ideas? + if (a) { + if (c) { + if (e) { + log(s ? LogType.MSG_IP_MASTER_FLAGS_CESA + : LogType.MSG_IP_MASTER_FLAGS_CEXA); + } else { + log(s ? LogType.MSG_IP_MASTER_FLAGS_CXSA + : LogType.MSG_IP_MASTER_FLAGS_CXXA); + } } else { - log(s ? LogType.MSG_IP_MASTER_FLAGS_CXS - : LogType.MSG_IP_MASTER_FLAGS_CXX); + if (e) { + log(s ? LogType.MSG_IP_MASTER_FLAGS_XESA + : LogType.MSG_IP_MASTER_FLAGS_XEXA); + } else { + log(s ? LogType.MSG_IP_MASTER_FLAGS_XXSA + : LogType.MSG_IP_MASTER_FLAGS_XXXA); + } } } else { - if (e) { - log(s ? LogType.MSG_IP_MASTER_FLAGS_XES - : LogType.MSG_IP_MASTER_FLAGS_XEX); + if (c) { + if (e) { + log(s ? LogType.MSG_IP_MASTER_FLAGS_CESX + : LogType.MSG_IP_MASTER_FLAGS_CEXX); + } else { + log(s ? LogType.MSG_IP_MASTER_FLAGS_CXSX + : LogType.MSG_IP_MASTER_FLAGS_CXXX); + } } else { - log(s ? LogType.MSG_IP_MASTER_FLAGS_XXS - : LogType.MSG_IP_MASTER_FLAGS_XXX); + if (e) { + log(s ? LogType.MSG_IP_MASTER_FLAGS_XESX + : LogType.MSG_IP_MASTER_FLAGS_XEXX); + } else { + log(s ? LogType.MSG_IP_MASTER_FLAGS_XXSX + : LogType.MSG_IP_MASTER_FLAGS_XXXX); + } } } } else { - if (c) { - if (e) { - log(s ? LogType.MSG_IP_SUBKEY_FLAGS_CES - : LogType.MSG_IP_SUBKEY_FLAGS_CEX); + if (a) { + if (c) { + if (e) { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_CESA + : LogType.MSG_IP_SUBKEY_FLAGS_CEXA); + } else { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_CXSA + : LogType.MSG_IP_SUBKEY_FLAGS_CXXA); + } } else { - log(s ? LogType.MSG_IP_SUBKEY_FLAGS_CXS - : LogType.MSG_IP_SUBKEY_FLAGS_CXX); + if (e) { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_XESA + : LogType.MSG_IP_SUBKEY_FLAGS_XEXA); + } else { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_XXSA + : LogType.MSG_IP_SUBKEY_FLAGS_XXXA); + } } } else { - if (e) { - log(s ? LogType.MSG_IP_SUBKEY_FLAGS_XES - : LogType.MSG_IP_SUBKEY_FLAGS_XEX); + if (c) { + if (e) { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_CESX + : LogType.MSG_IP_SUBKEY_FLAGS_CEXX); + } else { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_CXSX + : LogType.MSG_IP_SUBKEY_FLAGS_CXXX); + } } else { - log(s ? LogType.MSG_IP_SUBKEY_FLAGS_XXS - : LogType.MSG_IP_SUBKEY_FLAGS_XXX); + if (e) { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_XESX + : LogType.MSG_IP_SUBKEY_FLAGS_XEXX); + } else { + log(s ? LogType.MSG_IP_SUBKEY_FLAGS_XXSX + : LogType.MSG_IP_SUBKEY_FLAGS_XXXX); + } } } } |