aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysList.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug where Keybase extraData gets lost when SKS wins the search race.Tim Bray2014-09-251-0/+10
|
* Merge user ids in import list for better displayDominik Schürmann2014-09-211-0/+1
|
* Keys found on multiple servers are now imported from all of themTim Bray2014-09-131-0/+3
|
* Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵Tim Bray2014-09-131-2/+10
| | | | side is revoked/expired, the merge reflects that
* Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-131-0/+84