aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| * 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
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
| | * Fix OperationResultParcelmar-v-in2014-07-091-8/+8
| | | | | | | | | Naming conventions save lives... or atleast make addAll() work
| * | 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 ↵Vincent Breitmoser2014-07-091-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
| | * | 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
| |\ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
| | * 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
| |/
* / use SuperToast instead of AppMsg in code, part 2Vincent Breitmoser2014-07-071-0/+60
|/
* Merge branch 'create-keyring'Vincent Breitmoser2014-07-021-0/+7
|\
| * support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| | | | | | | | Closes #695
| * 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
| | | | closes #698
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-0/+1
|
* 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
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 20:13:43 +0000