aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'new-edit'Vincent Breitmoser2014-06-181-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 operationVincent Breitmoser2014-06-171-0/+22
| |
* | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-2/+3
| |
* | consolidate: almost sane loggingVincent Breitmoser2014-06-181-3/+4
| |
* | consolidate: make it workVincent Breitmoser2014-06-181-6/+6
| |
* | consolidate: add loggingVincent Breitmoser2014-06-181-0/+11
| |
* | handle database error on secret key insertVincent Breitmoser2014-06-171-0/+1
| |
* | canonicalize: support secret keysVincent Breitmoser2014-06-171-1/+3
|/
* drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+2
|
* import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-161-7/+33
| | | | more docs
* canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-121-0/+3
|
* canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-4/+0
|
* canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-121-2/+9
|
* import-log: more minor improvementsVincent Breitmoser2014-06-121-3/+1
|
* import-log: minor improvementsVincent Breitmoser2014-06-121-0/+2
|
* canonicalize: more stuffVincent Breitmoser2014-06-121-7/+10
|
* canonicalize: implementation, first draftVincent Breitmoser2014-06-121-2/+21
|
* import-log: properly distinguish return statesVincent Breitmoser2014-06-121-2/+2
|
* import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-3/+1
|
* import-log: work on log fragment uiVincent Breitmoser2014-06-101-3/+3
|
* import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-4/+5
|
* import-log: more interface workVincent Breitmoser2014-06-101-5/+21
|
* import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-0/+207