aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* Better exception handling for import of keysDominik Schürmann2014-07-311-5/+5
* Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-292-20/+29
|\
| * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-9/+18
| * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-11/+11
* | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
|/
* canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
* generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
* UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
* fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
* test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+5
* canonicalize: fix for testsVincent Breitmoser2014-07-193-5/+7
* Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1610-130/+318
|\
| * Fallback if no primary user id existsDominik Schürmann2014-07-165-6/+23
| * move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-155-15/+15
| * signatures: a revocation reason does NOT determine if a cert is a revocation ...Vincent Breitmoser2014-07-151-1/+1
| * merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-2/+6
| * modifyKey: error out on integrity check failsVincent Breitmoser2014-07-121-7/+9
| * createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-44/+56
| * modifyKey: proper expiry check during SubkeyAddVincent Breitmoser2014-07-111-2/+2
| * modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-113-27/+63
| * SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-111-15/+15
| * get rid of some inspection warningsVincent Breitmoser2014-07-111-0/+1
| * modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+10
| * fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
| * modifyKey: couple more fixes from testsVincent Breitmoser2014-07-112-4/+34
| * some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-112-12/+62
| * modifyKey: preserve master key flagsVincent Breitmoser2014-07-111-5/+22
| * add come createKey stringsVincent Breitmoser2014-07-111-1/+6
| * tests: add testSubkeyAddVincent Breitmoser2014-07-101-0/+4
* | Final Commit for #662Daniel Albert2014-07-161-1/+6
|/
* support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-4/+111
* fix subkey additionVincent Breitmoser2014-07-021-37/+59
* add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-292-35/+67
* fix nullpointerexception in importkeyactivityVincent Breitmoser2014-06-281-2/+10
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-282-61/+52
* ditch outdated certifyKey operationVincent Breitmoser2014-06-221-54/+0
* VERY basic test for save keyringArt O Cathain2014-06-211-0/+19
* Fix keybase importDominik Schürmann2014-06-202-1/+3
* Fix app name in PGP header, closing #663Dominik Schürmann2014-06-191-1/+1
* remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
* fix key exportVincent Breitmoser2014-06-181-1/+1
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-1/+3
* Merge branch 'new-edit'Vincent Breitmoser2014-06-182-714/+236
|\
| * new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-171-71/+113
| * new-edit: add new save keyring stuffVincent Breitmoser2014-06-172-148/+121
| * new-edit: remove old save keyring stuffVincent Breitmoser2014-06-171-546/+53
* | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-0/+16
* | consolidate: almost sane loggingVincent Breitmoser2014-06-181-1/+1
* | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-184-6/+28
* | consolidate: make it workVincent Breitmoser2014-06-181-93/+99
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 10:01:24 +0000