| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 4 | -45/+10 |
* | | | | | | | | | | renamed KeychainNewService to KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+2 |
* | | | | | | | | | | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 7 | -7/+126 |
* | | | | | | | | | | fixed Certify op | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+2 |
* | | | | | | | | | | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 2 | -184/+7 |
* | | | | | | | | | | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 3 | -181/+50 |
* | | | | | | | | | | migrated consolidation | Adithya Abraham Philip | 2015-06-27 | 3 | -19/+43 |
* | | | | | | | | | | migrated promote op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 3 | -29/+51 |
* | | | | | | | | | | migrated delete op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 3 | -25/+50 |
* | | | | | | | | | | migrated key creation to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -21/+0 |
* | | | | | | | | | | added export and upload to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 5 | -91/+102 |
* | | | | | | | | | | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 4 | -273/+113 |
|/ / / / / / / / / |
|
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -50/+64 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | fix warnings in PassphraseCacheService | Vincent Breitmoser | 2015-06-26 | 1 | -13/+25 |
| * | | | | | | | | | Notification: follow design guidelines, fix #1313 | Dominik Schürmann | 2015-06-24 | 1 | -48/+31 |
| * | | | | | | | | | New notify icon | Dominik Schürmann | 2015-06-24 | 1 | -1/+1 |
| * | | | | | | | | | New all-white status bar icon to fix issue #1356 | moparisthebest | 2015-06-22 | 1 | -2/+21 |
* | | | | | | | | | | small fix and some cleanup in ServiceProgressFragment | Vincent Breitmoser | 2015-06-22 | 1 | -12/+32 |
* | | | | | | | | | | minor code style fixes | Vincent Breitmoser | 2015-06-18 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 |
|\| | | | | | | | | |
|
| * | | | | | | | | | instrument: use contrib drawer methods, respect passphrase cache | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 |
* | | | | | | | | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 1 | -7/+23 |
* | | | | | | | | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 4 | -99/+108 |
|\| | | | | | | | | |
|
| * | | | | | | | | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 4 | -99/+108 |
* | | | | | | | | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 4 | -88/+169 |
|\| | | | | | | | | |
|
| * | | | | | | | | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 4 | -88/+169 |
* | | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 4 | -1014/+877 |
|\| | | | | | | | | |
|
| * | | | | | | | | | Partially revert "switch to native DialogFragment, fix some nullpointers", bu... | Vincent Breitmoser | 2015-06-03 | 1 | -2/+4 |
| * | | | | | | | | | Fix comments in service | Dominik Schürmann | 2015-06-01 | 1 | -8/+8 |
| * | | | | | | | | | corrected indentation | Adithya Abraham Philip | 2015-06-01 | 1 | -271/+278 |
| * | | | | | | | | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -3/+3 |
| * | | | | | | | | | merged services | Adithya Abraham Philip | 2015-06-01 | 3 | -446/+296 |
* | | | | | | | | | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 1 | -4/+0 |
* | | | | | | | | | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -1/+6 |
|/ / / / / / / / / |
|
* | | | | | | | | | switch to native DialogFragment, fix some nullpointers | Vincent Breitmoser | 2015-05-31 | 1 | -4/+2 |
* | | | | | | | | | some decrypt/verify bug fixes | Vincent Breitmoser | 2015-05-30 | 1 | -2/+9 |
* | | | | | | | | | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -160/+24 |
* | | | | | | | | | delete correct cache entries (important for yubikey pins!) | Vincent Breitmoser | 2015-05-30 | 1 | -2/+2 |
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-29 | 1 | -6/+16 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Partially revert "make masterKeyId and subKeyId strictly required in CryptoIn... | Vincent Breitmoser | 2015-05-28 | 1 | -6/+16 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -22/+14 |
|\| | | | | | | | | |
|
| * | | | | | | | | | make masterKeyId and subKeyId strictly required in CryptoInputParcel | Vincent Breitmoser | 2015-05-28 | 1 | -24/+14 |
| * | | | | | | | | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -3/+5 |
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
* | | | | | | | | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -3/+5 |
* | | | | | | | | | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 1 | -12/+0 |
* | | | | | | | | | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate keytocar... | Joey Castillo | 2015-05-13 | 1 | -2/+17 |
* | | | | | | | | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 3 | -28/+45 |
* | | | | | | | | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 2 | -1/+26 |
|/ / / / / / / / |
|
* | | | | | | / | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 1 | -11/+8 |
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -4/+4 |