Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 1 | -0/+24 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -0/+22 |
| | | |||||
* | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -2/+3 |
| | | |||||
* | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -3/+4 |
| | | |||||
* | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 1 | -6/+6 |
| | | |||||
* | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 1 | -0/+11 |
| | | |||||
* | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 1 | -0/+1 |
| | | |||||
* | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 1 | -1/+3 |
|/ | |||||
* | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 1 | -0/+2 |
| | |||||
* | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 1 | -7/+33 |
| | | | | more docs | ||||
* | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 1 | -0/+3 |
| | |||||
* | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -4/+0 |
| | |||||
* | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 1 | -2/+9 |
| | |||||
* | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 |
| | |||||
* | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -0/+2 |
| | |||||
* | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -2/+21 |
| | |||||
* | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 1 | -2/+2 |
| | |||||
* | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 |
| | |||||
* | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -3/+3 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -4/+5 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -5/+21 |
| | |||||
* | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -0/+207 |