diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-31 23:42:19 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-30 12:46:26 +0200 |
commit | 405b959fb8047d197b4447c568df87938a2a5638 (patch) | |
tree | 3250092727252e82c9a2fef953422b992cc4b138 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base | |
parent | 1dd61cab413b68ba632596624cd771e041b7877e (diff) | |
download | open-keychain-405b959fb8047d197b4447c568df87938a2a5638.tar.gz open-keychain-405b959fb8047d197b4447c568df87938a2a5638.tar.bz2 open-keychain-405b959fb8047d197b4447c568df87938a2a5638.zip |
No show key button for RESULT_INVALID_SIGNATURE, Cleanup
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java index dfb116173..e68684c52 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java @@ -453,7 +453,7 @@ public abstract class BaseNfcActivity extends BaseActivity { * @return The long key id of the requested key, or null if not found. */ public Long nfcGetKeyId(int idx) throws IOException { - byte[] fp = nfcGetFingerprint(idx); + byte[] fp = nfcGetMasterKeyFingerprint(idx); if (fp == null) { return null; } @@ -499,7 +499,7 @@ public abstract class BaseNfcActivity extends BaseActivity { * @param idx Index of the key to return the fingerprint from. * @return The fingerprint of the requested key, or null if not found. */ - public byte[] nfcGetFingerprint(int idx) throws IOException { + public byte[] nfcGetMasterKeyFingerprint(int idx) throws IOException { byte[] data = nfcGetFingerprints(); if (data == null) { return null; @@ -952,8 +952,11 @@ public abstract class BaseNfcActivity extends BaseActivity { name = (new String(Hex.decode(name))).replace('<', ' '); return name; } catch (IndexOutOfBoundsException e) { - Log.e(Constants.TAG, "couldn't get holder name", e); // try-catch for https://github.com/FluffyKaon/OpenPGP-Card + // Note: This should not happen, but happens with + // https://github.com/FluffyKaon/OpenPGP-Card, thus return an empty string for now! + + Log.e(Constants.TAG, "Couldn't get holder name, returning empty string!", e); return ""; } } |