aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
* Added braces to if else.danielnelz2015-03-092-4/+6
* Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-092-48/+78
* add support for certification of user attributesVincent Breitmoser2015-03-081-3/+11
* show refresh key progress inlineVincent Breitmoser2015-02-271-1/+6
* Merge keybase-proof branchDominik Schürmann2015-02-272-9/+151
|\
| * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-051-1/+1
| |\
| * | 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-112-5/+38
| * | | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-20/+113
* | | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-015-154/+28
* | | | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
* | | | 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-264-229/+306
|\| | | |
| * | | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-254-235/+251
| * | | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+20
| * | | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-6/+25
| * | | | allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-241-0/+7
| * | | | move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-241-8/+21
| * | | | support addition of user attributesVincent Breitmoser2015-01-131-0/+6
* | | | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-081-2/+1
|/ / / /
* | | | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-85/+11
* | | | fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-301-0/+3
* | | | introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-292-8/+74
| |_|/ |/| |
* | | Update target and support libs to SDK 21, fixing compile issuesDominik Schürmann2014-12-041-1/+1
| |/ |/|
* | 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
* fix test for new PgpDecryptVerifyVincent Breitmoser2014-10-141-1/+3
* 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-1011-1672/+12
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-101-9/+9
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-092-4/+5
|\
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-092-4/+5
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-091-1/+1
| * Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-091-1/+1
* | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2014-10-091-1/+1
|\ \ | |/ |/|
| * fix plurals quantity string in ImportKeyResultVincent Breitmoser2014-10-041-1/+1