aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
...
| * | | keep up with masterAshley Hughes2014-03-074-76/+227
| |\ \ \
| * | | | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-061-7/+11
| * | | | fix saving new key (tmp)Ashley Hughes2014-03-061-1/+3
| * | | | begin adding parcel for save intentAshley Hughes2014-03-021-3/+7
| * | | | pass through which keys are newAshley Hughes2014-02-221-2/+7
| * | | | remove deleted keysAshley Hughes2014-02-221-0/+4
| * | | | first go at saving IDs correctlyAshley Hughes2014-02-221-14/+64
| * | | | change how primary id changing is passed throughAshley Hughes2014-02-221-2/+2
| * | | | master mergeAshley Hughes2014-02-225-1161/+1395
| |\ \ \ \
| * | | | | initial split into two functionsAshley Hughes2014-02-211-24/+154
| * | | | | pass through deleted keysAshley Hughes2014-02-151-1/+1
| * | | | | save work, this code doesn't work...Ashley Hughes2014-02-131-18/+16
| * | | | | fix Android Studio analysis issuesAshley Hughes2014-02-081-37/+17
| * | | | | preserve keys that we don\'t use in the appAshley Hughes2014-02-041-3/+24
| * | | | | save flags from checkboxesAshley Hughes2014-02-031-16/+6
| * | | | | include authentication keysAshley Hughes2014-02-031-0/+30
* | | | | | Merge branch 'certify' into certsVincent Breitmoser2014-03-171-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-4/+60
* | | | | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-125/+209
|\ \ \ \ \ \
| * | | | | | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-151-4/+60
| |/ / / / /
| * | | | | certify: sign individual UIDsVincent Breitmoser2014-03-151-4/+16
| * | | | | certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-1511-505/+478
|\| | | |
| * | | | final code style changesuberspot2014-03-134-18/+28
| * | | | fix code style in /pgpuberspot2014-03-1311-491/+436
| * | | | Export cancellable - minor changesgrait2014-03-131-5/+3
| * | | | Export is cancellable nowgrait2014-03-131-2/+22
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-127-202/+331
|\| | | |
| * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-113-6/+7
| * | | | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-33/+27
| * | | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-092-74/+65
| * | | | removed useless semicolons, fixed some parameters in documenation, simplified...uberspot2014-03-071-3/+3
| * | | | remove unused imports and unthrown exceptionsuberspot2014-03-072-8/+1
| | |_|/ | |/| |
| * | | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-062-7/+7
| |\ \ \
| | * | | corrected commitAnkush2014-03-072-7/+7
| * | | | Fix verify of cleartext signatures with unknown keysDominik Schürmann2014-03-061-3/+5
| |/ / /
| * | | Fix passphrase retrievalDominik Schürmann2014-03-051-8/+10
| * | | Code cleaning in PgpDecryptVerifyDominik Schürmann2014-03-041-42/+46
| * | | Enforce private key for applications, verify signed-only texts without passph...Dominik Schürmann2014-03-042-41/+184
| | |/ | |/|
* / | add view cert activityVincent Breitmoser2014-03-122-1/+28
|/ /
* | precompile user id patternDominik Schürmann2014-02-211-2/+3
* | internal renaming, cleanupDominik Schürmann2014-02-212-15/+30
* | verification of cleartext signatures worksDominik Schürmann2014-02-212-18/+75
* | rename in READMEDominik Schürmann2014-02-201-1/+0
* | cleanupDominik Schürmann2014-02-191-4/+3
* | cleanupDominik Schürmann2014-02-192-9/+6
* | Builder pattern for PgpOperationIncomingDominik Schürmann2014-02-191-47/+88
* | certifications textDominik Schürmann2014-02-191-2/+4
* | fixes encryptionDominik Schürmann2014-02-191-4/+16
* | cleanupDominik Schürmann2014-02-191-12/+10