aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-35/+27
|\
| * fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-011-25/+14
| * pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-301-5/+4
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-11/+11
| |\
| * | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-2/+3
| * | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-1/+1
| * | fix more unit tests (syntax)Vincent Breitmoser2015-03-201-1/+2
| * | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-2/+3
| |\ \
| * | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-2/+4
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-11/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-231-218/+35
| * | | introduced multi-threadingAdithya Abraham Philip2015-03-231-26/+209
| | |/ | |/|
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-3/+4
|\| |
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-3/+4
| |/
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-38/+55
|\|
| * Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-111-1/+1
| * Added braces to if else.danielnelz2015-03-091-2/+3
| * Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-38/+54
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-285/+314
|\|
| * Merge keybase-proof branchDominik Schürmann2015-02-271-9/+146
| |\
| | * Add check that proof & database fingerprints are the sameTim Bray2014-11-211-3/+6
| | * Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-221-0/+1
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-15/+10
| | |\
| | * | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-191-1/+7
| | * | All keybase proofs now in placeTim Bray2014-11-111-5/+33
| | * | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-20/+113
| * | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-151/+24
| * | | Fix cleartext signatures internallyDominik Schürmann2015-01-271-5/+4
| * | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-38/+17
| |\ \ \
| | * | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-38/+17
| * | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-261-213/+246
| |\| | |
| | * | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-225/+242
| | * | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+20
| * | | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-081-2/+1
| |/ / /
* / / / affirmation -> linked identityVincent Breitmoser2015-01-151-1/+0
|/ / /
* | | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-85/+11
* | | introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-291-3/+8
| |/ |/|
* | more cleanupDominik Schürmann2014-11-211-14/+9
* | Minor code cleanupDominik Schürmann2014-11-211-1/+1
|/
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-261-2/+6
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-1/+2
* integrate download from keyserver into key import operationVincent Breitmoser2014-10-231-77/+8
* some cleanup and documentation of *Operation classesVincent Breitmoser2014-10-151-3/+0
* make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-131-35/+7
* remove DELETE_FILE_SECURELYVincent Breitmoser2014-10-131-23/+0
* rewrite export with new operation styleVincent Breitmoser2014-10-131-61/+20
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-121-23/+13
* move delete into operation classVincent Breitmoser2014-10-111-32/+7
* move around package structure a bitVincent Breitmoser2014-10-101-13/+12
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-101-9/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 18:59:05 +0000