aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-16 07:20:04 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-16 07:20:04 +0200
commit3defd194aaa79309c0a0921a63c5ab157081325c (patch)
treec7f94b8839f543edcd668febc8ab39f1dd3a1bae
parent9dc22ef510936adbcecfba2898a72cc8cffc3350 (diff)
parent018ca6abad3c0cca4d2116b99b3d204260b769e5 (diff)
downloadopen-keychain-3defd194aaa79309c0a0921a63c5ab157081325c.tar.gz
open-keychain-3defd194aaa79309c0a0921a63c5ab157081325c.tar.bz2
open-keychain-3defd194aaa79309c0a0921a63c5ab157081325c.zip
Merge pull request #859 from timbray/master
Fix construction of algorithmID in Keybase result lists
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java4
1 files changed, 2 insertions, 2 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 0a55fccc8..a228c3041 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -76,10 +76,10 @@ public class KeybaseKeyserver extends Keyserver {
// store extra info, so we can query for the keybase id directly
entry.setExtraData(username);
- final int algorithmId = match.getAlgorithmId();
- entry.setAlgorithm(PgpKeyHelper.getAlgorithmInfo(algorithmId, null, null));
final int bitStrength = match.getBitStrength();
entry.setBitStrength(bitStrength);
+ final int algorithmId = match.getAlgorithmId();
+ entry.setAlgorithm(PgpKeyHelper.getAlgorithmInfo(algorithmId, bitStrength, null));
ArrayList<String> userIds = new ArrayList<String>();
String name = fullName + " <keybase.io/" + username + ">";