aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
Commit message (Expand)AuthorAgeFilesLines
* Add missing license headersDominik Schürmann2015-03-156-0/+102
* Fix for Issue #1115Manoj Khanna2015-03-131-1/+2
* added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
* add support for certification of user attributesVincent Breitmoser2015-03-082-10/+18
* Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
* Remove advanced preferences, move compression as menu item in encrypt activit...Dominik Schürmann2015-03-051-8/+0
* Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ...Dominik Schürmann2015-03-041-0/+7
|\
| * added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
* | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
* | Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
|/
* Merge keybase-proof branchDominik Schürmann2015-02-271-0/+9
|\
| * Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+9
* | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
* | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0110-131/+346
* | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
* | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-295-198/+96
|\ \
| * | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-195-198/+96
* | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-274-3/+62
|\ \ \
| * | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-272-0/+12
| * | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-263-3/+50
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-267-7/+207
|\| | |
| * | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-254-6/+5
| * | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-255-1/+170
| * | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
| |/ /
| * | small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
| * | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+12
| * | support addition of user attributesVincent Breitmoser2015-01-131-0/+2
| * | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-0/+15
* | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-081-0/+16
|/ /
* | minor stuffVincent Breitmoser2015-01-031-3/+4
* | make certify routines more robust (#1016)Vincent Breitmoser2015-01-032-0/+7
* | add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-0/+1
* | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-034-15/+208
* | extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-022-14/+27
* | small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-0/+2
* | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+1
* | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-301-1/+3
|/
* export secret and public keys in separate armored blocksVincent Breitmoser2014-10-311-9/+24
* forgot a thing for secret key exportVincent Breitmoser2014-10-301-18/+24
* Close stream on key export to avoid partial write (see #986)Vincent Breitmoser2014-10-291-0/+7
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-262-0/+6
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-263-7/+39
* Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-261-0/+1
* remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-3/+10
* more rewordingVincent Breitmoser2014-10-251-2/+2
* change the way merging is loggedVincent Breitmoser2014-10-251-0/+4
* change indentation of import logsVincent Breitmoser2014-10-251-10/+10
* more work on import loggingVincent Breitmoser2014-10-251-1/+2
* add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-252-23/+49
* Fix import from cloudDominik Schürmann2014-10-241-1/+1