aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-60/+10
|\
| * wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-021-24/+0
| * fix missing userIds in ImportKeysListEntryVincent Breitmoser2014-05-271-2/+1
| * wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-37/+12
* | Store expired state within ImportKeysListEntrymar-v-in2014-06-041-0/+11
* | Store origin with ImportKeysListEntrymar-v-in2014-05-271-0/+11
|/
* Add highlighting to keyserver/keybase searchThialfihar2014-05-161-0/+9
* Rename fingerPrint to fingerprintThialfihar2014-05-141-8/+8
* Add extraData property in ImportKeyListEntryThialfihar2014-05-141-0/+11
* Move logic classes for import into own sub-packageDominik Schürmann2014-05-061-0/+268