aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-03 03:16:34 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-03 03:16:34 +0200
commit4cfc7feb430c984e5341d1bed7cd2fba499ebfa4 (patch)
treeb251f12bca1f8418865cb0f200a1d5b1480a70d7 /OpenKeychain/src/main/java/org/sufficientlysecure
parent2c22a4c2f6d172d6f81f7305d475d3079c350c85 (diff)
downloadopen-keychain-4cfc7feb430c984e5341d1bed7cd2fba499ebfa4.tar.gz
open-keychain-4cfc7feb430c984e5341d1bed7cd2fba499ebfa4.tar.bz2
open-keychain-4cfc7feb430c984e5341d1bed7cd2fba499ebfa4.zip
More beautifyKeyIdWithPrefix
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java3
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java2
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) {