aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
Commit message (Expand)AuthorAgeFilesLines
* promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-531/+0
* editKey: add support for sripping keysVincent Breitmoser2014-09-111-0/+1
* Properly handle uneditable key types in EditKeyFragmentVincent Breitmoser2014-09-081-0/+6
* cache key s2k type in database, for later useVincent Breitmoser2014-09-021-0/+2
* add cancel support to edit key actionVincent Breitmoser2014-08-311-12/+13
* Add cancelable mechanism and support in key importVincent Breitmoser2014-08-311-3/+7
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-301-2/+4
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-281-1/+6
|\
| * add ecc supportVincent Breitmoser2014-08-241-1/+6
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-271-3/+3
|\ \
| * | small language fixes for previous commitVincent Breitmoser2014-08-271-3/+3
* | | Strip out duplicate user idsDominik Schürmann2014-08-271-0/+1
|/ /
* / Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-271-0/+1
|/
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
* Notify duration, cleanupDominik Schürmann2014-08-201-5/+2
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-1/+3
|\
| * Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-201-1/+3
* | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-0/+1
|/
* Fix stringsDominik Schürmann2014-08-191-2/+2
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-5/+20
* consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-0/+1
* consolidate: working implementation, lacking uiVincent Breitmoser2014-08-171-0/+9
* modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-161-0/+4
* typed expected failures and a couple minor thingsVincent Breitmoser2014-08-161-2/+3
* support for master key modifications, among other stuffVincent Breitmoser2014-08-161-1/+12
* modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-0/+2
* modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+1
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+1
* Add license headersDominik Schürmann2014-08-041-0/+17
* couple of logging fixesVincent Breitmoser2014-07-311-2/+1
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-1/+0
* couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
* introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-3/+28
* some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-8/+0
* Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-261-9/+51
|\
| * test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+1
| * canonicalize: fix for testsVincent Breitmoser2014-07-191-0/+2
| * 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