aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'new-edit'Vincent Breitmoser2014-06-184-266/+53
|\
| * new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-172-1/+26
| * new-edit: add new save keyring stuffVincent Breitmoser2014-06-171-3/+3
| * new-edit: remove old save keyring stuffVincent Breitmoser2014-06-173-263/+23
* | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-2/+3
* | consolidate: almost sane loggingVincent Breitmoser2014-06-181-3/+4
* | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-1/+1
* | consolidate: make it workVincent Breitmoser2014-06-181-6/+6
* | consolidate: add loggingVincent Breitmoser2014-06-181-0/+11
* | prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-181-2/+2
* | handle database error on secret key insertVincent Breitmoser2014-06-171-0/+1
* | canonicalize: support secret keysVincent Breitmoser2014-06-171-1/+3
|/
* drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+2
* import-log: distinguish master/subkeys, distinguish redundant/bad certs, more...Vincent Breitmoser2014-06-161-7/+33
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-133-33/+222
|\
| * Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| * Fixing TAG and string resourcemar-v-in2014-06-061-2/+3
| * Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-6/+6
| |\
| * | Show keys with android contactsmar-v-in2014-06-051-0/+4
| * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-044-254/+301
| |\ \
| * | | First version of automatic contact discovery.mar-v-in2014-06-042-0/+201
| * | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYSmar-v-in2014-05-291-54/+15
| * | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
* | | | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-121-0/+3
* | | | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-4/+0
* | | | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-121-2/+9
* | | | import-log: more minor improvementsVincent Breitmoser2014-06-121-3/+1
* | | | import-log: minor improvementsVincent Breitmoser2014-06-121-0/+2
* | | | canonicalize: more stuffVincent Breitmoser2014-06-121-7/+10
* | | | canonicalize: implementation, first draftVincent Breitmoser2014-06-121-2/+21
* | | | import-log: properly distinguish return statesVincent Breitmoser2014-06-122-5/+5
* | | | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-3/+1
* | | | import-log: work on log fragment uiVincent Breitmoser2014-06-101-3/+3
* | | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-102-16/+48
* | | | import-log: more interface workVincent Breitmoser2014-06-102-7/+21
* | | | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-103-6/+276
| |_|/ |/| |
* | | neatness refactoringVincent Breitmoser2014-06-041-6/+6
| |/ |/|
* | make everything work againVincent Breitmoser2014-06-021-4/+5
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-021-43/+11
* | wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-021-5/+4
* | new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-273-69/+17
* | introduce new SaveKeyringParcelVincent Breitmoser2014-05-271-0/+113
* | rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-272-9/+14
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-6/+8
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-211-11/+11
|\|
| * Rename KeyServer to KeyserverDominik Schürmann2014-05-181-5/+5
| * Rename fingerPrint to fingerprintThialfihar2014-05-141-4/+4
| * Add extraData property in ImportKeyListEntryThialfihar2014-05-141-2/+2
* | use long rather than String to build uris by keyVincent Breitmoser2014-05-211-1/+1
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-212-13/+17
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 04:43:49 +0000