From 4cfc7feb430c984e5341d1bed7cd2fba499ebfa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 3 Oct 2014 03:16:34 +0200 Subject: [PATCH] More beautifyKeyIdWithPrefix --- .../org/sufficientlysecure/keychain/ui/DecryptFragment.java | 3 +-- .../keychain/ui/adapter/SelectKeyCursorAdapter.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 31a307194..6f521efa2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -122,8 +122,7 @@ public abstract class DecryptFragment extends Fragment { if (userIdSplit[1] != null) { mUserIdRest.setText(userIdSplit[1]); } else { - mUserIdRest.setText(getString(R.string.label_key_id) + ": " - + KeyFormattingUtils.convertKeyIdToHex(mSignatureKeyId)); + mUserIdRest.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(getActivity(), mSignatureKeyId)); } switch (signatureResult.getStatus()) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index 53e4e0fd6..6947fc1ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -128,7 +128,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter { } long masterKeyId = cursor.getLong(mIndexMasterKeyId); - h.keyId.setText(KeyFormattingUtils.convertKeyIdToHex(masterKeyId)); + h.keyId.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(mContext, masterKeyId)); boolean enabled = true; if (cursor.getInt(mIndexRevoked) != 0) {