aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-04 22:28:08 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-04 22:28:08 +0100
commit9d074b01e9c99c463c8b5f0b653528ef745c38ec (patch)
treea94f6e1ede42af0f373203a86f318bb8e851a9b2 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
parentecd376961f81583c76b22ba149f9af03b289c9bc (diff)
downloadopen-keychain-9d074b01e9c99c463c8b5f0b653528ef745c38ec.tar.gz
open-keychain-9d074b01e9c99c463c8b5f0b653528ef745c38ec.tar.bz2
open-keychain-9d074b01e9c99c463c8b5f0b653528ef745c38ec.zip
fix display of fingerprint in key server query
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 02a5fea9c..52186b662 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -120,13 +120,15 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
mainUserIdRest.setVisibility(View.GONE);
}
- // TODO: need to set no key?
- keyId.setText(R.string.no_key);
keyId.setText(entry.hexKeyId);
- fingerprint.setText(mActivity.getString(R.string.fingerprint) + " " + entry.fingerPrint);
- // TODO: no need to set algorithm empty...
- algorithm.setText("");
+ if (entry.fingerPrint != null) {
+ fingerprint.setText(mActivity.getString(R.string.fingerprint) + " " + entry.fingerPrint);
+ fingerprint.setVisibility(View.VISIBLE);
+ } else {
+ fingerprint.setVisibility(View.GONE);
+ }
+
algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
if (entry.revoked) {