aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
Commit message (Expand)AuthorAgeFilesLines
* merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-0/+1
* createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-0/+5
* Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-8/+8
|\
| * Fix OperationResultParcelmar-v-in2014-07-091-8/+8
* | get rid of some inspection warningsVincent Breitmoser2014-07-111-4/+0
* | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+1
* | add come createKey stringsVincent Breitmoser2014-07-111-1/+5
* | tests: add testSubkeyAddVincent Breitmoser2014-07-101-0/+1
* | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads...Vincent Breitmoser2014-07-091-0/+1
|\ \
| * | add toString for test easeArt O Cathain2014-07-061-0/+10
| |/
* | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-071-0/+10
|\ \ | |/ |/|
| * add toString for test easeArt O Cathain2014-07-061-0/+10
* | Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-061-5/+25
|/
* Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-0/+7
|\
| * support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| * add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-0/+5
* | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
|/
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-13/+13
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-0/+1
* Merge branch 'new-edit'Vincent Breitmoser2014-06-181-0/+24
|\
| * 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, more...Vincent Breitmoser2014-06-161-7/+33
* 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