aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-261-0/+2
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-0/+4
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-261-0/+14
* remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-4/+0
* slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
* change the way merging is loggedVincent Breitmoser2014-10-251-2/+2
* Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-161-5/+11
* some cleanup and documentation of *Operation classesVincent Breitmoser2014-10-151-1/+0
* make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-132-56/+25
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-121-6/+15
* move around package structure a bitVincent Breitmoser2014-10-107-491/+12
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-103-52/+77
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-097-24/+63
|\
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-097-24/+63
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-096-37/+30
| * Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-096-30/+37
* | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2014-10-091-1/+1
|\ \ | |/ |/|
| * yubikey: check with correct subkey id for sign operationVincent Breitmoser2014-10-041-1/+1
* | Remove unnecessary exceptionDominik Schürmann2014-10-082-9/+4
* | Big error screen if signature is invalid or key is revoked/expired, also fixe...Dominik Schürmann2014-10-082-3/+19
* | Move utf8 check for user id upwardsDominik Schürmann2014-10-071-4/+5
* | Fix MSG_MF_UID_PRIMARY logDominik Schürmann2014-10-071-1/+1
* | use sub results in importVincent Breitmoser2014-10-051-2/+6
* | add support for second line in log viewVincent Breitmoser2014-10-051-0/+3
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-041-2/+12
|\ \
| * | Pass imported master key ids via result parcelDominik Schürmann2014-10-041-2/+12
* | | certify: get rid of fingerprint checkVincent Breitmoser2014-10-041-5/+0
|/ /
* | improve CertifyResult, add custom notifyVincent Breitmoser2014-10-041-3/+5
* | redesign certify action to work with parcel input and resultVincent Breitmoser2014-10-044-5/+158
|/
* canonicalize: compare user ids as string rather than bytesVincent Breitmoser2014-10-041-3/+3
* clean up PgpImportExport a bitVincent Breitmoser2014-10-031-7/+5
* make getSignId a secret key operation, and respect unavailable keysVincent Breitmoser2014-10-025-64/+22
* Fix nullpointer with getS2K()Dominik Schürmann2014-10-021-1/+2
* More debugging outputDominik Schürmann2014-10-011-24/+29
* fix minor logic error (haha)Vincent Breitmoser2014-09-301-1/+1
* pass (encryption) key id from Decrypt*Fragment to NfcActivityVincent Breitmoser2014-09-301-2/+2
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-301-1/+3
* fix method visibility for testsVincent Breitmoser2014-09-282-33/+37
* move can.*() methods to CanonicalizedPublicKey, where they belongVincent Breitmoser2014-09-283-81/+83
* be more mindful of algorithm and usage flag interactionVincent Breitmoser2014-09-282-16/+40
* only check for primary binding certificate if key algorithm even supports sig...Vincent Breitmoser2014-09-281-9/+15
* Reject subkeys with no key flags and no primary key binding certificateVincent Breitmoser2014-09-281-27/+35
* use correct pin for nfc in EncryptActivityVincent Breitmoser2014-09-241-1/+1
* fix signatures produced by yubikeyVincent Breitmoser2014-09-241-12/+15
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-231-1/+3
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-231-1/+15
* add test case for duplicate keys in keyring (#870)Vincent Breitmoser2014-09-232-4/+4
* Feature to change key configuration in create keyDominik Schürmann2014-09-211-1/+0
* Add null check to getSecretKeyTypeDominik Schürmann2014-09-211-1/+1
* fix isLocal logic (f*ck yeah unit tests!)Vincent Breitmoser2014-09-201-1/+1