aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
...
| * modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-161-0/+4
| * Always return a SaveKeyringResult from savingDominik Schürmann2014-08-161-1/+6
| * Fix and simplify in OperationResultParcelDominik Schürmann2014-08-161-11/+7
| * typed expected failures and a couple minor thingsVincent Breitmoser2014-08-161-2/+3
| * support for master key modifications, among other stuffVincent Breitmoser2014-08-161-1/+12
| * modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-0/+2
| * modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+1
| * Fix encrypt onlyDominik Schürmann2014-08-162-18/+22
| * fix keys with no expiry in ui codeVincent Breitmoser2014-08-141-2/+7
| * Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-141-4/+33
| * handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-141-8/+22
| * move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
| * Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+1
| * Remove support for v3 sig generationDominik Schürmann2014-08-141-1/+0
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-142-55/+144
|\|
| * Dont write version header by defaultDominik Schürmann2014-08-141-1/+1
| * Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-132-49/+72
| * Decrypt metadata apiDominik Schürmann2014-08-111-1/+1
| * Get original filename for decryptionDominik Schürmann2014-08-111-8/+73
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-067-81/+200
|\|
| * Optimize importsDominik Schürmann2014-08-055-10/+10
| * Create key: make single user id primary user id, other cleanupDominik Schürmann2014-08-051-0/+1
| * Refactor expiry dialogDominik Schürmann2014-08-051-5/+67
| * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-041-2/+2
| * Add license headersDominik Schürmann2014-08-043-0/+51
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-2/+2
| * Remove support for IO_FILE, this is no longer used and was never a good pract...Dominik Schürmann2014-08-041-29/+2
| * Merge pull request #728 from mar-v-in/improve-file-moreDominik Schürmann2014-08-041-40/+72
| |\
| | * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-8/+14
| | |\
| | * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-011-0/+5
| | |\ \
| | * \ \ Merge branch 'master' into improve-file-moremar-v-in2014-07-316-124/+414
| | |\ \ \
| | * \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-07-065-48/+82
| | |\ \ \ \
| | * | | | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
| | * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-012-13/+107
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-241-0/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-221-14/+14
| | |\ \ \ \ \ \ \
| | * | | | | | | | Improve file more, Part 1mar-v-in2014-06-221-5/+16
* | | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-3/+7
|\| | | | | | | | |
| * | | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-011-3/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-015-132/+260
|\| | | | | | | |
| * | | | | | | | Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
| * | | | | | | | Merge pull request #726 from mar-v-in/fix-import-from-serverDominik Schürmann2014-08-011-3/+14
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Undo import changesmar-v-in2014-08-011-3/+27
| | * | | | | | | Fix import from servermar-v-in2014-08-011-30/+17
| | | |_|_|_|_|/ | | |/| | | | |
| * / | | | | | Fix update from keyserverDominik Schürmann2014-07-311-0/+5
| |/ / / / / /
| * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-311-2/+2
| * | | | | | Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-311-7/+6
| * | | | | | avoid nullpointerexception in EditKeyResultVincent Breitmoser2014-07-311-2/+2
| * | | | | | Keyserver exception translateableDominik Schürmann2014-07-311-1/+1
| * | | | | | couple of logging fixesVincent Breitmoser2014-07-311-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 12:58:33 +0000