moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues Releases Wiki Activity

Don't guess keybase key algorithm and size

Browse Source 
Once keybase reports them, we can display them. Until then we simply
don't know and shouldn't lie about it.
This commit is contained in:
Thialfihar 2014-05-14 14:14:02 +02:00
parent 6162247155
commit 056a6dd347
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java
View File

@ -98,10 +98,8 @@ public class KeybaseKeyServer extends KeyServer {
entry.setExtraData(keybaseId);
// TODO: Fix; have suggested keybase provide this value to avoid search-time crypto calls
entry.setBitStrength(4096);
entry.setAlgorithm("RSA");
entry.setKeyIdHex("0x" + key_fingerprint);
entry.setRevoked(false);
//entry.setBitStrength(4096);
//entry.setAlgorithm("RSA");
// ctime
final long creationDate = JWalk.getLong(match, "them", "public_keys", "primary", "ctime");

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View File

@ -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);