diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-08 17:32:41 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-08 17:32:41 +0200 |
commit | 158f22a799e6a51dff64aa54303bf4bb7b495b4e (patch) | |
tree | 515d2f304dbbd16e27305d46295005d5eb15c9c5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | b573afe2359653d0ddeb9f35075ca22af40b0ab4 (diff) | |
parent | 590650a3039ebabe820241bf8709569812aad7a8 (diff) | |
download | open-keychain-158f22a799e6a51dff64aa54303bf4bb7b495b4e.tar.gz open-keychain-158f22a799e6a51dff64aa54303bf4bb7b495b4e.tar.bz2 open-keychain-158f22a799e6a51dff64aa54303bf4bb7b495b4e.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
2 files changed, 1 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java index 6a8dcbcec..ddfbac03c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java @@ -173,16 +173,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment } }); - // UI tidbit: "my key" is the area above the checkbox, if the user clicks there he - // probably actually wants to hit the checkbox - View vMyKeyLabel = view.findViewById(R.id.label_my_key); - vMyKeyLabel.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mUploadKeyCheckbox.performClick(); - } - }); - return root; } 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 a59cb175f..afc3247be 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 @@ -286,7 +286,7 @@ public class KeyFormattingUtils { } public static String beautifyKeyIdWithPrefix(Context context, String idHex) { - return "ID: " + beautifyKeyId(idHex); + return "Key ID: " + beautifyKeyId(idHex); } public static String beautifyKeyIdWithPrefix(Context context, long keyId) { |