aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-021-19/+11
|\
| * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-231-7/+7
| |
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| |
| * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-17/+7
| |
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵Vincent Breitmoser2014-06-021-4/+19
|/ | | | ImportKeysListEntry
* Rename KeyServer to KeyserverDominik Schürmann2014-05-181-5/+5
|
* Move logic classes for import into own sub-packageDominik Schürmann2014-05-061-2/+2
|
* stupid identation stuffTim Bray2014-04-301-1/+1
|
* can search openkeychain, retrieve & install & use keys from thereTim Bray2014-04-291-3/+49
|
* Optimize importsDominik Schürmann2014-04-151-0/+2
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+305