aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* 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
* | | | | | | | | make FileImportCache generic, iterable, and add unit testVincent Breitmoser2014-08-011-3/+7
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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
* | | | | | rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-313-12/+11
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-0/+1
|\ \ \ \ \ \
| * | | | | | couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
* | | | | | | Create key: work on uploadDominik Schürmann2014-07-301-0/+9
|/ / / / / /
* | | | | | return values for create keyDominik Schürmann2014-07-301-4/+2
* | | | | | Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-294-42/+158
|\ \ \ \ \ \
| * | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-273-26/+69
| * | | | | | some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-273-20/+33
| * | | | | | Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-264-50/+224
| |\ \ \ \ \ \
| * | | | | | | use SuperToast instead of AppMsg in code, part 2Vincent Breitmoser2014-07-072-3/+64
| * | | | | | | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-4/+3
| | |_|_|_|_|/ | |/| | | | |