| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 |
* | | | | | | | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 |
* | | | | | | | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 1 | -5/+3 |
* | | | | | | | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 2 | -51/+3 |
* | | | | | | | | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 2 | -0/+26 |
* | | | | | | | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+30 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 1 | -59/+11 |
* | | | | | | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 1 | -52/+6 |
* | | | | | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 4 | -70/+14 |
* | | | | | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 1 | -2/+0 |
* | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -2/+5 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 |
| | |_|_|_|/
| |/| | | | |
|
* | | | | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 1 | -2/+18 |
* | | | | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+0 |
* | | | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -2/+7 |
* | | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 4 | -5/+5 |
|\| | | | | |
|
| * | | | | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 4 | -16/+16 |
* | | | | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 2 | -9/+22 |
* | | | | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 |
* | | | | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+3 |
* | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 2 | -9/+12 |
|\| | | | | |
|
| * | | | | | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 2 | -8/+11 |
| | |_|_|/
| |/| | | |
|
* | | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 3 | -34/+11 |
* | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 3 | -8/+6 |
* | | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 4 | -4/+85 |
* | | | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 2 | -14/+4 |
|/ / / / |
|
* | | | | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+2 |
* | | | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| |_|/
|/| | |
|
* | | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ... | Dominik Schürmann | 2015-03-04 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 |
| | |/
| |/| |
|
* | | | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 |
* | | | Fix root cause of #1077 | Morgan Gangwere | 2015-03-03 | 1 | -6/+70 |
|/ / |
|
* | | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -0/+9 |
|\ \ |
|
| * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -0/+9 |
* | | | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+1 |
* | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 5 | -119/+198 |
* | | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
* | | | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 5 | -198/+96 |
|\ \ \ |
|
| * | | | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 5 | -198/+96 |
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 3 | -0/+17 |
|\ \ \ \ |
|
| * | | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 2 | -0/+12 |
| * | | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 2 | -0/+5 |
* | | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 2 | -3/+95 |
|\| | | | |
|
| * | | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -3/+3 |
| * | | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 2 | -0/+60 |
| * | | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -0/+2 |
| |/ / / |
|
| * | | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 |
| * | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+12 |
| * | | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -0/+2 |
| * | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -0/+15 |
| | |/
| |/| |
|