From da4a70c5137d37dab41d1ee65627f38ed78204e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 20 Sep 2014 18:12:13 +0200 Subject: no monospace for key ids --- .../keychain/ui/util/KeyFormattingUtils.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 2b56dd3a7..5c2bc76d0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -261,7 +261,7 @@ public class KeyFormattingUtils { * @param idHex - the key id * @return - the beautified form */ - public static SpannableString beautifyKeyId(String idHex) { + public static String beautifyKeyId(String idHex) { if (idHex.startsWith("0x")) { idHex = idHex.substring(2); } @@ -276,9 +276,7 @@ public class KeyFormattingUtils { idHex = sb.toString(); } - SpannableString ss = new SpannableString(idHex); - ss.setSpan(new TypefaceSpan("monospace"), 0, idHex.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - return ss; + return idHex; } /** @@ -288,19 +286,15 @@ public class KeyFormattingUtils { * @param keyId - the key id * @return - the beautified form */ - public static SpannableString beautifyKeyId(long keyId) { + public static String beautifyKeyId(long keyId) { return beautifyKeyId(convertKeyIdToHex(keyId)); } - public static SpannableStringBuilder beautifyKeyIdWithPrefix(Context context, String idHex) { - SpannableStringBuilder ssb = new SpannableStringBuilder(); - ssb.append("ID"); - ssb.append(": "); - ssb.append(beautifyKeyId(idHex)); - return ssb; + public static String beautifyKeyIdWithPrefix(Context context, String idHex) { + return "ID: " + beautifyKeyId(idHex); } - public static SpannableStringBuilder beautifyKeyIdWithPrefix(Context context, long keyId) { + public static String beautifyKeyIdWithPrefix(Context context, long keyId) { return beautifyKeyIdWithPrefix(context, convertKeyIdToHex(keyId)); } -- cgit v1.2.3