diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 02:10:44 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 02:10:44 +0100 |
| commit | 9798ef7bfda98cd30582bcac82e4f151d0c7cf94 (patch) | |
| tree | 2c95d60908332b05d430321a144e55f15e5d3779 /OpenKeychain/src | |
| parent | 1f324be24316175a111b9424a22fc5fcb6104e2b (diff) | |
| download | open-keychain-9798ef7bfda98cd30582bcac82e4f151d0c7cf94.tar.gz open-keychain-9798ef7bfda98cd30582bcac82e4f151d0c7cf94.tar.bz2 open-keychain-9798ef7bfda98cd30582bcac82e4f151d0c7cf94.zip | |
fixed length identifiers
Diffstat (limited to 'OpenKeychain/src')
2 files changed, 4 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java index fb3f2433a..b21f482b7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java @@ -66,10 +66,8 @@ public abstract class LinkedCookieResource extends LinkedResource { } public static String generate (Context context, byte[] fingerprint, int nonce) { - - return "[Verifying my PGP key: openpgp4fpr:" - + KeyFormattingUtils.convertFingerprintToHex(fingerprint) + "#" + Integer.toHexString(nonce) + "]"; - + return String.format("\"[Verifying my PGP key: openpgp4fpr:%s#%08x]\"", + KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce); } public static String generatePreview () { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java index 5df008ed7..d5b8a0345 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java @@ -41,9 +41,8 @@ public class DnsResource extends LinkedCookieResource { public static String generateText (Context context, byte[] fingerprint, int nonce) { - return "pgpid+cookie=" - + KeyFormattingUtils.convertFingerprintToHex(fingerprint) + ";" - + Integer.toHexString(nonce) + ""; + return String.format("pgpid+cookie=%s;%08x", + KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce); } |