| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-07-08 | 2 | -3/+14 |
|\ |
|
| * | addition of subkeys for divert-to-card primary keys is not supported | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 |
| * | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 |
| * | try cache in certify operation (fixes #1242) | Vincent Breitmoser | 2015-07-07 | 1 | -3/+12 |
* | | Temporary fix for multi export | Dominik Schürmann | 2015-07-08 | 1 | -10/+12 |
|/ |
|
* | don't cache exporthelper, keep type for KeyItem in KeySpinner | Vincent Breitmoser | 2015-07-06 | 1 | -11/+11 |
* | nicer error msg if input data cannot be read | Vincent Breitmoser | 2015-07-06 | 1 | -0/+1 |
* | cleanup, NonNull annotation, never return null in PgpDecryptVerify | Vincent Breitmoser | 2015-07-06 | 10 | -50/+60 |
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 7 | -44/+161 |
* | removed e.printStackTrace from several places | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+2 |
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 2 | -13/+11 |
* | added keyserver/proxy support to certify operation | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+3 |
* | added OperationResult support to upload to keyserver | Adithya Abraham Philip | 2015-07-03 | 2 | -9/+19 |
* | added proxy support, silent right now | Adithya Abraham Philip | 2015-07-03 | 2 | -1/+2 |
* | Fix caching of empty passphrase before moving keys to card | Dominik Schürmann | 2015-07-03 | 1 | -7/+16 |
* | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -0/+2 |
* | Add create key fragments for YubiKey PINs | Dominik Schürmann | 2015-07-01 | 2 | -3/+0 |
* | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 3 | -344/+379 |
* | fixed package import | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+1 |
* | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 3 | -3/+58 |
* | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 4 | -4/+219 |
* | migrated consolidation | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+27 |
* | fixed promote key tests | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
* | migrated promote op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+10 |
* | migrated delete op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+10 |
* | added export and upload to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+41 |
* | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -15/+259 |
* | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 4 | -4/+4 |
* | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 |
|\ |
|
| * | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 |
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -6/+10 |
|\| |
|
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -6/+10 |
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 2 | -2/+6 |
|\| |
|
| * | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 |
| * | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
* | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 4 | -7/+13 |
|\| |
|
| * | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 4 | -7/+13 |
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 3 | -18/+25 |
|\| |
|
| * | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 2 | -3/+3 |
| * | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -3/+10 |
| * | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 2 | -12/+12 |
* | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -0/+13 |
|/ |
|
* | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -10/+21 |
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 |
* | fix RequiredInputParcel handling in CertifyOperation | Vincent Breitmoser | 2015-05-29 | 1 | -6/+25 |
* | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 |
* | don't show allowed key list if no key exists, and some minor PgpDecryptVerify... | Vincent Breitmoser | 2015-05-28 | 2 | -5/+8 |
* | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 |
* | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 2 | -2/+32 |
* | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 |