aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
Commit message (Expand)AuthorAgeFilesLines
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-724/+0
* Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+12
|\
| * backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+12
* | Fixes for detached signaturesDominik Schürmann2015-01-261-9/+26
* | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-081-2/+1
* | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-081-19/+75
|/
* tests: add multi key encryption/decryption test, new way for fake passphrase ...Vincent Breitmoser2015-01-011-1/+1
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-261-0/+14
* make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-131-29/+13
* move around package structure a bitVincent Breitmoser2014-10-101-3/+3
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-091-1/+2
|\
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-091-1/+2
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-091-8/+5
| * Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-091-5/+8
* | yubikey: check with correct subkey id for sign operationVincent Breitmoser2014-10-041-1/+1
|/
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-301-1/+3
* use correct pin for nfc in EncryptActivityVincent Breitmoser2014-09-241-1/+1
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-0/+2
* Fix nfc signingDominik Schürmann2014-09-181-1/+1
* package reordering: merge util and helper, there were no real difference; cre...Dominik Schürmann2014-09-171-3/+4
* Work on new result handling (WIP)Dominik Schürmann2014-09-171-13/+36
* move LogLevel info into LogType enumVincent Breitmoser2014-09-151-23/+22
* work on OperationResultParcelVincent Breitmoser2014-09-141-4/+4
* pending results are a type of non-successVincent Breitmoser2014-09-141-0/+1
* add SignEncryptResult parcel (probably break stuff)Vincent Breitmoser2014-09-141-163/+179
* Set literal data format tag to UTF8 when encrypting textDominik Schürmann2014-09-131-1/+7
* add some comments to previous commitVincent Breitmoser2014-09-101-0/+1
* jury-rig broken sign mechanismVincent Breitmoser2014-09-091-10/+24
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-281-10/+10
|\
| * Fix encrypt onlyDominik Schürmann2014-08-161-10/+10
| * Remove support for v3 sig generationDominik Schürmann2014-08-141-80/+10
* | Support for multiple hash algosDominik Schürmann2014-08-141-2/+4
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-141-42/+67
|\|
| * Dont write version header by defaultDominik Schürmann2014-08-141-4/+10
| * Add option to pass original filename to PgpSignEncryptDominik Schürmann2014-08-111-12/+20
| * progress for signing binaryDominik Schürmann2014-08-111-15/+27
| * Introduction of metadata api, starting to fix decryption progressDominik Schürmann2014-08-101-9/+9
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-061-2/+3
|\|
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-2/+3
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-5/+5
|\|
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-5/+5
* | Remove support for V3 signaturesDominik Schürmann2014-07-221-90/+14
* | Reuse signature creation timestamp for synchronous signingDominik Schürmann2014-07-221-22/+19
* | NFC Yubikey: only pass through hash of message and not whole contentDominik Schürmann2014-07-211-38/+38
* | FixesDominik Schürmann2014-07-171-19/+74
|/
* use long rather than String to build uris by keyVincent Breitmoser2014-05-211-1/+1
* wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-211-5/+5
* Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-141-2/+0
|\
| * use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-081-2/+0
* | wrapped-key-ring: redesign underlying CachedKeyRingVincent Breitmoser2014-05-041-4/+5