From 639b6994ce9307ffd90fa36f79c5899c4757241e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 12 Jul 2018 13:39:02 +0200 Subject: [PATCH] set ViewKeyActivity title to key id for anonymous keys --- .../keychain/ui/keyview/ViewKeyActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java index 443f220e4..fa152900f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java @@ -684,7 +684,13 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements this.unifiedKeyInfo = unifiedKeyInfo; String name = unifiedKeyInfo.name(); - collapsingToolbarLayout.setTitle(name != null ? name : getString(R.string.user_id_no_name)); + boolean isAnonymousKey = name == null && unifiedKeyInfo.email() == null; + if (isAnonymousKey) { + String readableKeyId = KeyFormattingUtils.beautifyKeyId(unifiedKeyInfo.master_key_id()); + collapsingToolbarLayout.setTitle(readableKeyId); + } else { + collapsingToolbarLayout.setTitle(name != null ? name : getString(R.string.user_id_no_name)); + } // if the refresh animation isn't playing if (!rotate.hasStarted() && !rotateSpin.hasStarted()) {