aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* Edit key: key flagsDominik Schürmann2014-08-051-1/+1
* Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ...Dominik Schürmann2014-08-052-17/+14
* Add license headersDominik Schürmann2014-08-0411-0/+187
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-2/+2
* delete unused PgpConversionHelperVincent Breitmoser2014-08-041-102/+0
* small fix for MSG_MF_UID_ADD log entryVincent Breitmoser2014-08-011-1/+1
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-012-6/+2
|\
| * fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-012-6/+2
* | Add user id with dialogDominik Schürmann2014-08-011-3/+25
|/
* more fixes on canonicalization and progressVincent Breitmoser2014-07-312-21/+22
* completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-311-15/+81
* fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
* always return an EditKeyResult in modifyKey methodVincent Breitmoser2014-07-311-25/+25
* reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-26/+65
* couple of logging fixesVincent Breitmoser2014-07-311-2/+3
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-3112-111/+98
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 10:39:42 +0000