aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-11 14:39:35 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-11 14:39:35 +0200
commit85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1 (patch)
tree4a20a9065d9411d35b720a0fd446ab4e2ff89b9f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
parent0687f7f40e1aecf4fbc109c3ab3fa2c3613546b3 (diff)
parentbaa3c86e1246d486d80c963ddc6c64b58f2a5093 (diff)
downloadopen-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.tar.gz
open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.tar.bz2
open-keychain-85bb3d9480ccc52908e7a43379c5e2eda9dbd7f1.zip
Merge pull request #553 from Valodim/split-masterKeyId
Split master key & partial fix for uid order
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index d1753de83..02149124c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
@@ -294,6 +294,7 @@ public class HkpKeyServer extends KeyServer {
userIds.add(tmp);
}
entry.setUserIds(userIds);
+ entry.setPrimaryUserId(userIds.get(0));
results.add(entry);
}