Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 1 | -12/+35 |
| | |||||
* | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 1 | -5/+21 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -6/+6 |
| | |||||
* | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 1 | -0/+4 |
| | |||||
* | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 1 | -9/+30 |
| | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | ||||
* | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+1 |
| | |||||
* | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -0/+10 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.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/dialog/SetPassphraseDialogFragment.java | ||||
* | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 2 | -2/+21 |
| | |||||
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 2 | -30/+73 |
| | |||||
* | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -15/+66 |
| | |||||
* | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 3 | -52/+166 |
| | |||||
* | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 1 | -0/+52 |