diff options
author | uberspot <onexemailx@gmail.com> | 2014-03-09 04:09:00 +0200 |
---|---|---|
committer | uberspot <onexemailx@gmail.com> | 2014-03-09 04:14:23 +0200 |
commit | 059e57c5d0b9192308d7d0ae036a731a038f5d6c (patch) | |
tree | b816da6436a5104a8e5b43b9958dbfbf30c9dcc6 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider | |
parent | 50d9908bafd1b55640deb3a0b2cff4e06155cc5e (diff) | |
download | open-keychain-059e57c5d0b9192308d7d0ae036a731a038f5d6c.tar.gz open-keychain-059e57c5d0b9192308d7d0ae036a731a038f5d6c.tar.bz2 open-keychain-059e57c5d0b9192308d7d0ae036a731a038f5d6c.zip |
Colorize fingerprint
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 1a16f6db3..ac0692213 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -87,7 +87,7 @@ public class ProviderHelper { } /** - * Retrieves the actual PGPPublicKeyRing object from the database blob based on the maserKeyId + * Retrieves the actual PGPPublicKeyRing object from the database blob based on the masterKeyId */ public static PGPPublicKeyRing getPGPPublicKeyRingByMasterKeyId(Context context, long masterKeyId) { @@ -110,11 +110,8 @@ public class ProviderHelper { */ public static PGPPublicKey getPGPPublicKeyByKeyId(Context context, long keyId) { PGPPublicKeyRing keyRing = getPGPPublicKeyRingByKeyId(context, keyId); - if (keyRing == null) { - return null; - } - return keyRing.getPublicKey(keyId); + return (keyRing == null)? null : keyRing.getPublicKey(keyId); } /** @@ -149,11 +146,8 @@ public class ProviderHelper { */ public static PGPSecretKey getPGPSecretKeyByKeyId(Context context, long keyId) { PGPSecretKeyRing keyRing = getPGPSecretKeyRingByKeyId(context, keyId); - if (keyRing == null) { - return null; - } - return keyRing.getSecretKey(keyId); + return (keyRing == null) ? null : keyRing.getSecretKey(keyId); } /** |