| Commit message (Expand) | Author | Age | Files | Lines |
* | fix result type for divert-to-card new subkey error | Vincent Breitmoser | 2015-07-08 | 1 | -1/+1 |
* | addition of subkeys for divert-to-card primary keys is not supported | Vincent Breitmoser | 2015-07-08 | 1 | -2/+6 |
* | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 1 | -27/+48 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-07 | 1 | -1/+1 |
|\ |
|
| * | tests: make sure encryption happens to all enc-capable subkeys | Vincent Breitmoser | 2015-07-07 | 1 | -1/+1 |
* | | Simplify getLineSeparator in PgpDecryptVerify | Dominik Schürmann | 2015-07-07 | 1 | -7/+1 |
|/ |
|
* | also catch DecoderException in decryptverify | Vincent Breitmoser | 2015-07-06 | 1 | -2/+3 |
* | encrypt to all encryption subkeys, rather than just the first | Vincent Breitmoser | 2015-07-06 | 3 | -22/+27 |
* | catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown fr... | Vincent Breitmoser | 2015-07-06 | 1 | -0/+7 |
* | forgot a couple lines to commit | Vincent Breitmoser | 2015-07-06 | 1 | -0/+10 |
* | nicer error msg if input data cannot be read | Vincent Breitmoser | 2015-07-06 | 1 | -3/+3 |
* | cleanup, NonNull annotation, never return null in PgpDecryptVerify | Vincent Breitmoser | 2015-07-06 | 1 | -14/+22 |
* | removed e.printStackTrace from several places | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
* | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -0/+20 |
* | Use proper length and mod time for cleartext signature metadata | Dominik Schürmann | 2015-06-29 | 1 | -2/+2 |
* | Return metadata for cleartext sigs | Dominik Schürmann | 2015-06-29 | 1 | -0/+7 |
* | Guess mime type like support libs FileProvider | Dominik Schürmann | 2015-06-29 | 1 | -7/+1 |
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -1/+1 |
|\ |
|
| * | fixed fingerprint mismatch issue | Adithya Abraham Philip | 2015-06-25 | 1 | -1/+1 |
* | | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 1 | -3/+70 |
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 2 | -21/+8 |
|\| |
|
| * | fix filesize reporting in decrypt operation | Vincent Breitmoser | 2015-06-17 | 1 | -0/+6 |
| * | fix returned text of cleartext verify | Vincent Breitmoser | 2015-06-17 | 1 | -4/+5 |
| * | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 1 | -7/+2 |
* | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 2 | -9/+1 |
|\| |
|
| * | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 2 | -9/+1 |
* | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 1 | -16/+32 |
* | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 2 | -28/+33 |
|/ |
|
* | only promote subkeys which are actually present | Vincent Breitmoser | 2015-05-30 | 1 | -8/+5 |
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 2 | -126/+237 |
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -1/+7 |
* | rewrite data flow in EncryptFileFragment preserve state correctly | Vincent Breitmoser | 2015-05-30 | 1 | -0/+4 |
* | make KeyItem serializble, for state in TokenTextCompleteView | Vincent Breitmoser | 2015-05-30 | 1 | -1/+2 |
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 4 | -12/+16 |
|\ |
|
| * | improve robustness of SecretKeyType handling | Vincent Breitmoser | 2015-05-28 | 2 | -8/+10 |
| * | set to stripped by default, rather than "unavailable" | Vincent Breitmoser | 2015-05-28 | 1 | -3/+3 |
| * | make masterKeyId and subKeyId strictly required in CryptoInputParcel | Vincent Breitmoser | 2015-05-28 | 2 | -1/+3 |
| * | fix merge problems (derp) | Vincent Breitmoser | 2015-05-28 | 1 | -4/+2 |
* | | Merge branch 'master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -13/+20 |
|\| |
|
| * | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -6/+8 |
| * | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+21 |
| * | don't show allowed key list if no key exists, and some minor PgpDecryptVerify... | Vincent Breitmoser | 2015-05-28 | 1 | -13/+24 |
| * | add user id flags to UserAttribute self signatures | Vincent Breitmoser | 2015-05-20 | 1 | -13/+20 |
| * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 2 | -3/+21 |
* | | create keys with fixed timestamp | Vincent Breitmoser | 2015-05-28 | 1 | -5/+7 |
* | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+21 |
* | | don't show allowed key list if no key exists, and some minor PgpDecryptVerify... | Vincent Breitmoser | 2015-05-28 | 1 | -13/+24 |
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 2 | -3/+21 |
* | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+36 |
* | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 1 | -17/+13 |