| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Remove support for IO_FILE, this is no longer used and was never a good pract... | Dominik Schürmann | 2014-08-04 | 1 | -29/+2 |
| * | Merge pull request #728 from mar-v-in/improve-file-more | Dominik Schürmann | 2014-08-04 | 1 | -40/+72 |
| |\ |
|
| | * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -8/+14 |
| | |\ |
|
| | * \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -0/+5 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -40/+44 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -16/+29 |
| | |\ \ \ \ |
|
| | * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
| | * | | | | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -5/+16 |
| * | | | | | | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -3/+7 |
| | |_|_|_|/
|/| | | | |
|
| * | | | | | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 |
| * | | | | | Merge pull request #726 from mar-v-in/fix-import-from-server | Dominik Schürmann | 2014-08-01 | 1 | -3/+14 |
| |\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| | * | | | | Undo import changes | mar-v-in | 2014-08-01 | 1 | -3/+27 |
| | * | | | | Fix import from server | mar-v-in | 2014-08-01 | 1 | -30/+17 |
| | | |_|/
| |/| | |
|
| * / | | | Fix update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 |
| |/ / / |
|
| * | | | completely overengineer progress indication in {modify,create}SecretKeyRing m... | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| * | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ... | Dominik Schürmann | 2014-07-31 | 1 | -7/+6 |
| * | | | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -9/+9 |
| * | | | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -4/+2 |
| * | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 1 | -22/+28 |
| * | | | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -1/+2 |
| * | | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -1/+1 |
| * | | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -2/+1 |
| * | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 1 | -1/+2 |
| |\ \ \ |
|
| | * | | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 1 | -1/+2 |
| | | |/
| |/| |
|
| * / | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 1 | -2/+2 |
| |/ / |
|
| * | | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 1 | -17/+29 |
| |\ \ |
|
| | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 1 | -16/+28 |
| | |/ |
|
| * / | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 1 | -0/+1 |
| |/ |
|
| * | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 1 | -140/+30 |
| |\ |
|
| | * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-18 | 1 | -4/+3 |
| | |\ |
|
| | | * | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | | * | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -2/+2 |
| | * | | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -1/+4 |
| | * | | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -134/+22 |
| | |/ |
|
| | * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -33/+15 |
| | |\ |
|
| | * | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -6/+6 |
| * | | | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -1/+1 |
| * | | | Modify KeychainIntentService to support I/O with URIs, allow input and output... | mar-v-in | 2014-06-08 | 1 | -172/+105 |
| | |/
|/| |
|
| * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -6/+6 |
| |\| |
|
| | * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -6/+6 |
| * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -112/+61 |
| |\| |
|
| | * | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -4/+5 |
| | * | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import... | Vincent Breitmoser | 2014-06-02 | 1 | -43/+11 |
| | * | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 1 | -5/+4 |
| | * | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 1 | -20/+9 |
| | * | rename SaveKeyringParcel to OldSaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -1/+1 |
| | * | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -6/+8 |
| | * | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 1 | -11/+11 |
| | |\ |
|
| | * | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -10/+14 |
| | * | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -7/+59 |
| | |\ \ |
|
