| Commit message (Expand) | Author | Age | Files | Lines |
* | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 1 | -5/+2 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -3/+3 |
|\ |
|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -3/+10 |
| |\ |
|
| * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 2 | -3/+3 |
* | | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 |
| |/
|/| |
|
* | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -3/+10 |
|/ |
|
* | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -2/+2 |
* | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -5/+20 |
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 2 | -10/+4 |
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 3 | -0/+32 |
* | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+1 |
* | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -0/+4 |
* | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 1 | -1/+6 |
* | Fix and simplify in OperationResultParcel | Dominik Schürmann | 2014-08-16 | 1 | -11/+7 |
* | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 1 | -2/+3 |
* | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -1/+12 |
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -0/+2 |
* | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+1 |
* | Fix encrypt only | Dominik Schürmann | 2014-08-16 | 2 | -18/+22 |
* | fix keys with no expiry in ui code | Vincent Breitmoser | 2014-08-14 | 1 | -2/+7 |
* | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -4/+33 |
* | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+22 |
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -0/+1 |
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
* | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 2 | -49/+72 |
* | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 1 | -1/+1 |
* | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 1 | -8/+73 |
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 5 | -10/+10 |
* | Create key: make single user id primary user id, other cleanup | Dominik Schürmann | 2014-08-05 | 1 | -0/+1 |
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -5/+67 |
* | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 1 | -2/+2 |
* | Add license headers | Dominik Schürmann | 2014-08-04 | 3 | -0/+51 |
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -2/+2 |
* | 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 | 6 | -124/+414 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 5 | -48/+82 |
| |\ \ \ \ |
|
| * | | | | | Add support for multiple input/output URIs to KeychainIntentService | mar-v-in | 2014-07-03 | 1 | -35/+56 |
| * | | | | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 2 | -13/+107 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' into improve-file-more | mar-v-in | 2014-06-24 | 1 | -0/+5 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-... | mar-v-in | 2014-06-22 | 1 | -14/+14 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | 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 |