diff options
| author | Tim Bray <timbray@gmail.com> | 2014-09-13 09:39:10 -0700 |
|---|---|---|
| committer | Tim Bray <timbray@gmail.com> | 2014-09-13 21:41:03 -0700 |
| commit | 7de86a09bc3bae47c44b9dcb65bbda1298ccf843 (patch) | |
| tree | a4f9a8b24958b500ed52415d1f1584a03b865779 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java | |
| parent | e14cf32264d92c4b0d4ca782d74a1589ee52a396 (diff) | |
| download | open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.tar.gz open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.tar.bz2 open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.zip | |
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java | 2 |
1 files changed, 2 insertions, 0 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 cbd06da90..ff582e5ed 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java @@ -65,6 +65,8 @@ public class KeybaseKeyserver extends Keyserver { entry.setQuery(mQuery); entry.setOrigin(ORIGIN); + entry.setRevoked(false); // keybase doesn’t say anything about revoked keys + String username = match.getUsername(); String fullName = match.getFullName(); String fingerprint = match.getFingerprint(); |