diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-05 18:16:29 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-05 18:16:29 +0200 |
commit | fc3a6920028e3dd4f31be0681145d2a3a4700bd2 (patch) | |
tree | 3155c4a54721cac386498e5d5134466d64599e09 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
parent | 5ab0d76c696512ea0830f178df17bb23c38e9e6c (diff) | |
parent | 781197021875d06e22ff28fb7983391b36910c5b (diff) | |
download | open-keychain-fc3a6920028e3dd4f31be0681145d2a3a4700bd2.tar.gz open-keychain-fc3a6920028e3dd4f31be0681145d2a3a4700bd2.tar.bz2 open-keychain-fc3a6920028e3dd4f31be0681145d2a3a4700bd2.zip |
Merge pull request #645 from timbray/master
Don't show full fingerprint in key search result lists
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
2 files changed, 4 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java index f9b6abf18..145738e66 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java @@ -144,7 +144,8 @@ public class KeybaseKeyserver extends Keyserver { try { JSONObject json = new JSONObject(text); if (JWalk.getInt(json, "status", "code") != 0) { - throw new QueryFailedException("Keybase autocomplete search failed"); + throw new QueryFailedException("Keybase.io query failed: " + path + "?" + + query); } return json; } catch (JSONException e) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index 0684efe0f..041fc8040 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -149,12 +149,8 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> { holder.keyId.setText(entry.keyIdHex); - if (entry.fingerprintHex != null) { - holder.fingerprint.setVisibility(View.VISIBLE); - holder.fingerprint.setText(PgpKeyHelper.colorizeFingerprint(entry.fingerprintHex)); - } else { - holder.fingerprint.setVisibility(View.GONE); - } + // don't show full fingerprint on key import + holder.fingerprint.setVisibility(View.GONE); if (entry.bitStrength != 0 && entry.algorithm != null) { holder.algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm); |