| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 2 | -11/+29 |
| * | flag revoked, epired and unavailable keys in selection spinner | Vincent Breitmoser | 2014-09-07 | 1 | -0/+2 |
| * | work on passphrase caching, make use of cached SecretKeyType data (WIP!) | Vincent Breitmoser | 2014-09-03 | 2 | -11/+17 |
| * | add getSecretKeyType method to CachedPublicKeyRing | Vincent Breitmoser | 2014-09-03 | 2 | -2/+32 |
| * | 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 | 4 | -9/+20 |
| * | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 6 | -0/+6 |
| * | 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 | 3 | -3/+7 |
| * | 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 | 2 | -9/+174 |
| * | Remove old_apg | Dominik Schürmann | 2014-08-15 | 1 | -4/+4 |
| * | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -19/+19 |
| * | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 2 | -0/+12 |
| |\ |
|
| | * | small bug in has_certify | mar-v-in | 2014-08-14 | 1 | -1/+1 |
| | * | add HAS_CERTIFY (not sure why it's missing) | mar-v-in | 2014-08-14 | 2 | -0/+12 |
| * | | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -0/+4 |
| * | | tests: add ProviderHelperSaveTest, with long key id collision test | Vincent Breitmoser | 2014-08-14 | 1 | -0/+5 |
| |/ |
|
| * | 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 |
| * | Merge pull request #766 from mar-v-in/patch-1 | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| |\ |
|
| | * | Handle keys without expiry date right | mar-v-in | 2014-08-14 | 1 | -2/+2 |
| * | | 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 |
| * | Add convenience method to unified keyrings to determine whether a keyring is ... | mar-v-in | 2014-08-12 | 2 | -1/+5 |
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 2 | -5/+6 |
| * | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 3 | -20/+22 |
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 2 | -0/+34 |
| * | Cleanup, prevent encrypt Intent inception | Dominik Schürmann | 2014-08-04 | 1 | -4/+4 |
| * | Fix debug backup/restore methods | Dominik Schürmann | 2014-08-04 | 1 | -22/+17 |
| * | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 2 | -89/+79 |
| |\ |
|
| | * | 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 |
| | * | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -0/+4 |
| | * | 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 |
| * | | - add multi select for storage api (kitkat) | mar-v-in | 2014-07-31 | 1 | -0/+2 |
| * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -1/+5 |
| |\| |
|
| | * | don't use zero plural string for english | Vincent Breitmoser | 2014-07-02 | 1 | -1/+5 |
