aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
* fixed fingerprint mismatch issueAdithya Abraham Philip2015-06-251-1/+1
|
* fix filesize reporting in decrypt operationVincent Breitmoser2015-06-171-0/+6
|
* fix returned text of cleartext verifyVincent Breitmoser2015-06-171-4/+5
|
* fix recursive log in modifySecretKeyRingVincent Breitmoser2015-06-171-7/+2
|
* eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-062-9/+1
|
* only promote subkeys which are actually presentVincent Breitmoser2015-05-301-8/+5
|
* rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-302-126/+237
|
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-1/+7
|
* rewrite data flow in EncryptFileFragment preserve state correctlyVincent Breitmoser2015-05-301-0/+4
|
* make KeyItem serializble, for state in TokenTextCompleteViewVincent Breitmoser2015-05-301-1/+2
|
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-284-12/+16
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml
| * improve robustness of SecretKeyType handlingVincent Breitmoser2015-05-282-8/+10
| |
| * set to stripped by default, rather than "unavailable"Vincent Breitmoser2015-05-281-3/+3
| |
| * make masterKeyId and subKeyId strictly required in CryptoInputParcelVincent Breitmoser2015-05-282-1/+3
| |
| * fix merge problems (derp)Vincent Breitmoser2015-05-281-4/+2
| |
* | Merge branch 'master' into developmentVincent Breitmoser2015-05-281-13/+20
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * create keys with fixed timestampVincent Breitmoser2015-05-281-6/+8
| |
| * warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+21
| |
| * don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-13/+24
| | | | | | | | PgpDecryptVerify changes
| * add user id flags to UserAttribute self signaturesVincent Breitmoser2015-05-201-13/+20
| |
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-172-3/+21
| |
* | create keys with fixed timestampVincent Breitmoser2015-05-281-5/+7
| |
* | warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+21
| |
* | don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-13/+24
| | | | | | | | PgpDecryptVerify changes
* | apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-172-3/+21
| |
* | Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-131-0/+36
| |
* | Bugfixes and changes based on feedbackJoey Castillo2015-05-131-17/+13
| |
* | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵Joey Castillo2015-05-131-18/+18
| | | | | | | | keytocard; operation unsets it and fills in dummyDivert to finish it.
* | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-12/+93
| |
* | Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-0/+24
|/
* check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-061-0/+11
|
* license header for PgpCertifyOperationDominik Schürmann2015-05-041-1/+19
|
* Apply patch from ↵Dominik Schürmann2015-05-041-2/+9
| | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938
* Buffer ascii armored encryption/signaturesDominik Schürmann2015-04-132-3/+4
|
* fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-014-50/+43
|
* work on passphrase data flowVincent Breitmoser2015-03-311-10/+34
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-43/+24
|
* pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-303-56/+10
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-4/+10
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * Fixed #1152:Kent2015-03-201-5/+11
| | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding.
* | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-221-0/+4
| |
* | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-6/+7
| |
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-211-2/+4
| |
* | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-212-3/+7
| | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+5
| |
* | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+10
| |
* | fix more unit tests (syntax)Vincent Breitmoser2015-03-202-1/+6
| |
* | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
| |
* | fix unit tests (syntax)Vincent Breitmoser2015-03-201-1/+1
| |
* | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:30:00 +0000