cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fingerprint handling

Browse Source
This commit is contained in:
Dominik Schürmann
2014-03-20 19:48:18 +01:00
parent df6fff93f0
commit 59d51fe68e
9 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,7 +452,7 @@ public class PgpKeyHelper {
key = secretKey.getPublicKey();
}
return convertFingerprintToHex(key.getFingerprint(), true);
return convertFingerprintToHex(key.getFingerprint());
}
/**
@@ -465,19 +465,12 @@ public class PgpKeyHelper {
* @param split split into 4 character chunks
* @return
*/
public static String convertFingerprintToHex(byte[] fingerprint, boolean split) {
public static String convertFingerprintToHex(byte[] fingerprint) {
String hexString = Hex.toHexString(fingerprint);
if (split) {
hexString = splitFingerprintHex(hexString);
}
return hexString;
}
public static String splitFingerprintHex(String hexString) {
return hexString.replaceAll("(.{4})(?!$)", "$1 ");
}
/**
* Convert key id from long to 64 bit hex string
* <p/>
@@ -511,6 +504,9 @@ public class PgpKeyHelper {
public static SpannableStringBuilder colorizeFingerprint(String fingerprint) {
// split by 4 characters
fingerprint = fingerprint.replaceAll("(.{4})(?!$)", "$1 ");
// add line breaks to have a consistent "image" that can be recognized
char[] chars = fingerprint.toCharArray();
chars[24] = '\n';