Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-09-13 | 2 | -3/+8 |
|\ | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 3 | -0/+6 |
| |\ | |||||
| * | | Cleanup tests | Dominik Schürmann | 2014-09-13 | 2 | -10/+4 |
| * | | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 |
* | | | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 5 | -6/+9 |
| |/ |/| | |||||
* | | very small fix, don't show name on encoding warning | Vincent Breitmoser | 2014-09-13 | 1 | -2/+1 |
* | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-13 | 1 | -8/+3 |
|\ \ | |||||
| * | | Cleanup test | Dominik Schürmann | 2014-09-13 | 1 | -8/+3 |
| |/ | |||||
* / | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 3 | -0/+7 |
|/ | |||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 10 | -216/+384 |
|\ | |||||
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 2 | -7/+15 |
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 4 | -26/+166 |
| * | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 6 | -64/+113 |
| * | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 8 | -233/+204 |
* | | deactivate screenshots in new PassphraseDialogActivity | Dominik Schürmann | 2014-09-13 | 2 | -0/+11 |
* | | More smaller UI fixes | Dominik Schürmann | 2014-09-13 | 3 | -0/+7 |
* | | If expired/revoked, disable both encrypt buttons | Dominik Schürmann | 2014-09-13 | 1 | -0/+3 |
* | | Test for badly encoded user ids | Dominik Schürmann | 2014-09-13 | 2 | -1/+31 |
* | | Add new PassphraseDialogActivity, a transparent activity that only holds the ... | Dominik Schürmann | 2014-09-13 | 2 | -2/+361 |
* | | Fix share to encrypt text | Dominik Schürmann | 2014-09-13 | 2 | -25/+22 |
* | | Use spannable directly instead of html conversion in SubkeysAdapter | Dominik Schürmann | 2014-09-13 | 2 | -12/+20 |
* | | Fix tests | Dominik Schürmann | 2014-09-13 | 2 | -2/+4 |
* | | Add key with bad user id encoding | Dominik Schürmann | 2014-09-13 | 1 | -0/+60 |
* | | Remove unused method in KeyUpdateHelper | Dominik Schürmann | 2014-09-13 | 1 | -17/+0 |
* | | Merge pull request #843 from da-kid/master | Dominik Schürmann | 2014-09-13 | 5 | -80/+315 |
|\ \ | |||||
| * | | Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeR... | Daniel Albert | 2014-09-13 | 3 | -38/+81 |
| * | | Implemented Pull2Refresh in the KeyListFragment | Daniel Albert | 2014-09-12 | 5 | -80/+272 |
* | | | Get certificates by raw user ids, be more liberal about accepted user id enco... | Dominik Schürmann | 2014-09-13 | 5 | -39/+72 |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 29 | -426/+494 |
|\ \ \ | | |/ | |/| | |||||
| * | | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 29 | -426/+494 |
| |/ | |||||
* / | getSignaturesForID can return null, check this | Dominik Schürmann | 2014-09-13 | 2 | -119/+138 |
|/ | |||||
* | fix key upload after certification (hopefully?) | Vincent Breitmoser | 2014-09-12 | 1 | -4/+1 |
* | add ui support for stripping subkeys | Vincent Breitmoser | 2014-09-11 | 4 | -16/+38 |
* | editKey: add test case for previous commit | Vincent Breitmoser | 2014-09-11 | 1 | -0/+54 |
* | editKey: add support for sripping keys | Vincent Breitmoser | 2014-09-11 | 3 | -2/+32 |
* | merge: adapt testcase to previous commit | Vincent Breitmoser | 2014-09-11 | 1 | -9/+41 |
* | merge: add support for s2k dummy generation | Vincent Breitmoser | 2014-09-11 | 2 | -23/+3 |
* | nullpointer check in KeychainProvider | Dominik Schürmann | 2014-09-11 | 1 | -1/+1 |
* | nullpointer check in KeychainProvider | Dominik Schürmann | 2014-09-11 | 1 | -0/+4 |
* | Add newly discussed design decisions for passphrase cache service | Dominik Schürmann | 2014-09-10 | 1 | -0/+9 |
* | add some comments to previous commit | Vincent Breitmoser | 2014-09-10 | 3 | -1/+12 |
* | jury-rig broken sign mechanism | Vincent Breitmoser | 2014-09-09 | 4 | -30/+61 |
* | Version 2.9.2 | Dominik Schürmann | 2014-09-09 | 1 | -2/+2 |
* | Fix test | Dominik Schürmann | 2014-09-09 | 2 | -5/+2 |
* | Changelog 2.9.2 | Dominik Schürmann | 2014-09-09 | 2 | -0/+10 |
* | Increase s2k count to 0x90 | Dominik Schürmann | 2014-09-09 | 1 | -4/+6 |
* | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 7 | -27/+52 |
* | Yubikey decryption works now | Dominik Schürmann | 2014-09-09 | 1 | -0/+0 |
* | Unify package name | Dominik Schürmann | 2014-09-08 | 2 | -1/+1 |
* | Update nfc lib | Dominik Schürmann | 2014-09-08 | 1 | -0/+0 |