aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff options
context:
space:
mode:
authorThialfihar <thi@thialfihar.org>2014-05-14 14:14:02 +0200
committerThialfihar <thi@thialfihar.org>2014-05-14 14:28:54 +0200
commit056a6dd3479fe1e5cc5981ac51a458b015d3e9cb (patch)
treeec148c32059aa50273af6380811ca6b9a889746e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
parent61622471557dc1f67a1465ca8fcace7604a8c1a7 (diff)
downloadopen-keychain-056a6dd3479fe1e5cc5981ac51a458b015d3e9cb.tar.gz
open-keychain-056a6dd3479fe1e5cc5981ac51a458b015d3e9cb.tar.bz2
open-keychain-056a6dd3479fe1e5cc5981ac51a458b015d3e9cb.zip
Don't guess keybase key algorithm and size
Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java7
1 files changed, 6 insertions, 1 deletions
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 9d323c822..70b9f3f7e 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
@@ -153,7 +153,12 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
holder.fingerprint.setVisibility(View.GONE);
}
- holder.algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
+ if (entry.bitStrength != 0 && entry.algorithm != null) {
+ holder.algorithm.setText("" + entry.bitStrength + "/" + entry.algorithm);
+ holder.algorithm.setVisibility(View.VISIBLE);
+ } else {
+ holder.algorithm.setVisibility(View.INVISIBLE);
+ }
if (entry.revoked) {
holder.status.setVisibility(View.VISIBLE);