Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-31 | 1 | -1/+6 |
|\ | |||||
| * | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -1/+4 |
| | | |||||
| * | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -0/+2 |
| | | | | | | | | Closes #323 | ||||
* | | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 1 | -0/+2 |
|/ | |||||
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+4 |
| | | | | closes #797 | ||||
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 1 | -3/+23 |
|\ | | | | | ECC support | ||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -3/+21 |
| | | |||||
| * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 1 | -3/+5 |
|\ \ | |||||
| * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 1 | -3/+5 |
| | | | |||||
* | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 1 | -1/+2 |
|/ / | |||||
* | | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | subkeys, fix #696 | ||||
* | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 1 | -2/+0 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 |
|\ | |||||
| * | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 |
| | | |||||
| * | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 |
| | | |||||
* | | improve certs_text | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
|/ | |||||
* | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 1 | -2/+2 |
| | |||||
* | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 |
| | |||||
* | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 |
| | |||||
* | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -4/+4 |
| | |||||
* | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -5/+23 |
| | |||||
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -0/+3 |
| | |||||
* | Header for certs view | Dominik Schürmann | 2014-08-19 | 1 | -0/+1 |
| | |||||
* | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 1 | -0/+1 |
| | |||||
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+15 |
| | |||||
* | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -1/+5 |
| | |||||
* | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 1 | -2/+2 |
| | |||||
* | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -1/+3 |
| | |||||
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -0/+2 |
| | |||||
* | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+1 |
| | |||||
* | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 1 | -2/+3 |
| | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | ||||
* | merge: check fingerprints on merge operation! (this needs a testcase!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | change keybase hint following pull request #755 | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | |||||
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -1/+2 |
| | |||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | |||||
* | Add user info dialog | Dominik Schürmann | 2014-08-13 | 1 | -0/+8 |
| | |||||
* | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 1 | -0/+1 |
| | |||||
* | Readd missing string | Dominik Schürmann | 2014-08-07 | 1 | -0/+1 |
| | |||||
* | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Increase maximum custom RSA size | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | | | | selection for adding new subkeys | ||||
* | More work on add subkey dialog design | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Better handling of user id revocation in UI code | Dominik Schürmann | 2014-08-05 | 1 | -0/+5 |
| | |||||
* | Refactor expiry dialog | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | KeychainContract: use longs instead of String, other fixes | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -75/+0 |
| | |||||
* | Even more smaller nitpicks | Dominik Schürmann | 2014-08-04 | 1 | -0/+1 |
| |