aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* new edit key: diff for existing user idsDominik Schürmann2014-06-221-0/+5
* use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
* Merge branch 'master' of https://github.com/open-keychain/open-keychain into ...mar-v-in2014-06-191-0/+1
|\
| * canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-0/+1
* | Merge branch 'master' into improve-filemar-v-in2014-06-186-274/+464
|\|
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-182-6/+23
| |\
| | * Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-181-2/+20
| | |\
| | | * Reset importDone at the beginning of syncmar-v-in2014-06-181-0/+1
| | | * Wait for import to be done before writing contactsmar-v-in2014-06-181-2/+19
| * | | 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
| |\|
| * | 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
* | | Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-101-1/+1
* | | Modify KeychainIntentService to support I/O with URIs, allow input and output...mar-v-in2014-06-081-172/+105
| |/ |/|
* | 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
|\|
| * neatness refactoringVincent Breitmoser2014-06-041-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
|\|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 03:29:41 +0000