moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-11 11:35:07 -05:00
Code Issues Releases Wiki Activity

Let convertKeyIdToHex handle short key IDs

Browse Source 
If a short key ID is given, then it should only be displayed as such.
This commit is contained in:
Thialfihar 2014-03-20 14:09:35 +01:00
parent 4137fbff5b
commit 16ae9c8999
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
View File

@ -477,6 +477,11 @@ public class PgpKeyHelper {
* @return * @return
*/ */
public static String convertKeyIdToHex(long keyId) { public static String convertKeyIdToHex(long keyId) {
long upper = keyId >> 32;
if (upper == 0) {
// this is a short key id
return convertKeyIdToHexShort(keyId);
}
return "0x" + convertKeyIdToHex32bit(keyId >> 32) + convertKeyIdToHex32bit(keyId); return "0x" + convertKeyIdToHex32bit(keyId >> 32) + convertKeyIdToHex32bit(keyId);
} }