| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | work on passphrase caching, make use of cached SecretKeyType data (WIP!) | Vincent Breitmoser | 2014-09-03 | 1 | -1/+10 |
| * | add getSecretKeyType method to CachedPublicKeyRing | Vincent Breitmoser | 2014-09-03 | 1 | -2/+16 |
| * | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -15/+30 |
| * | ditch NullProgressable | Vincent Breitmoser | 2014-08-30 | 1 | -2/+2 |
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -1/+1 |
| * | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -3/+1 |
| |\ |
|
| | * | Fix key sharing | Dominik Schürmann | 2014-08-20 | 1 | -3/+1 |
| * | | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 1 | -0/+4 |
| * | | consolidate: remove debug "breakpoint" | Vincent Breitmoser | 2014-08-20 | 1 | -5/+0 |
| |/ |
|
| * | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -86/+103 |
| * | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -0/+5 |
| * | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 1 | -2/+1 |
| * | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -1/+1 |
| * | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -23/+63 |
| * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -15/+50 |
| * | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -8/+173 |
| * | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -19/+19 |
| * | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -0/+4 |
| * | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -10/+0 |
| * | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -0/+10 |
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+4 |
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 1 | -1/+1 |
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -5/+5 |
| * | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -7/+7 |
| * | Fix CachedPublicKeyring | mar-v-in | 2014-08-01 | 1 | -0/+4 |
| * | Remove runtime check to fix passphrase service | Dominik Schürmann | 2014-08-01 | 1 | -6/+0 |
| * | fix bug in UploadKeyActivity, minor work on uri handling | Vincent Breitmoser | 2014-07-31 | 1 | -0/+6 |
| * | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -67/+64 |
| * | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -23/+13 |
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 |
| |\ |
|
| | * | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -1/+1 |
| * | | some fixes for edit | Dominik Schürmann | 2014-07-15 | 1 | -1/+1 |
| |/ |
|
| * | some UncachedKeyRing fixes, primary user id mostly | Vincent Breitmoser | 2014-07-11 | 1 | -6/+5 |
| * | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+5 |
| * | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -2/+2 |
| * | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -60/+35 |
| * | fix indentation in various key import methods | Vincent Breitmoser | 2014-06-22 | 1 | -60/+64 |
| * | VERY basic test for save keyring | Art O Cathain | 2014-06-21 | 1 | -13/+2 |
| * | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -18/+18 |
| * | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -42/+54 |
| * | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -43/+166 |
| * | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -0/+13 |
| * | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 1 | -10/+2 |
| * | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+8 |
| * | consolidate: first draft | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| * | import-log: don't count self certs as unknown | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| * | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -73/+85 |
| * | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -1/+4 |
