aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
Commit message (Expand)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
* added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-7/+18
* object oriented split user idDominik Schürmann2015-03-161-10/+8
* Disable maybe methods in ImportKeysListEntry for nowDominik Schürmann2015-03-101-2/+3
* split up and mark unsafe expiry-related methodsVincent Breitmoser2015-02-261-2/+2
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-1/+1
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-6/+6
* deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-1/+2
* Make bit size optionalDominik Schürmann2014-10-051-2/+5
* fix nullpointer ImportKeysListEntry (from pulltorefresh)Vincent Breitmoser2014-09-231-2/+5
* Merge user ids in import list for better displayDominik Schürmann2014-09-211-13/+54
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-3/+3
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-0/+1
* package reordering: merge util and helper, there were no real difference; cre...Dominik Schürmann2014-09-171-4/+4
* Keys found on multiple servers are now imported from all of themTim Bray2014-09-131-7/+9
* Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-131-0/+7
* add ecc supportVincent Breitmoser2014-08-241-8/+15
* Fallback if no primary user id existsDominik Schürmann2014-07-161-1/+1
* use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-221-0/+10
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-58/+80
|\
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-63/+63
| |\
| | * Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-58/+58
| * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-60/+10
| |\|
| * | Store expired state within ImportKeysListEntrymar-v-in2014-06-041-0/+11
| * | Store origin with ImportKeysListEntrymar-v-in2014-05-271-0/+11
* | | canonicalize: first step(s)Vincent Breitmoser2014-06-101-1/+1
| |/ |/|
* | 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
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 14:59:24 +0000