aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-0511-564/+1043
|\
| * db-overhaul: fix DecryptAndVerify with and without known keysVincent Breitmoser2014-04-041-51/+59
| * db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-1/+1
| * db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-041-3/+3
| * ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-033-34/+6
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-039-127/+238
| |\
| | * Rename "pass phrase" to "passphrase"Thialfihar2014-04-021-21/+21
| | * Add missing and curly brackets and fix othersThialfihar2014-04-021-5/+10
| | * Rearrange too long linesThialfihar2014-04-025-52/+77
| | * Adjust variable/member naming to conform to style guideThialfihar2014-04-021-5/+5
| | * Trivial spacing changes to conform to style guideThialfihar2014-04-022-9/+11
| | * Adjust import orderThialfihar2014-04-021-0/+3
| | * new ID sigs already added, so do save themAshley Hughes2014-04-021-1/+1
| | * allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-021-3/+3
| | * pass through info that keys are new without relying on new keys orginally bei...Ashley Hughes2014-04-011-2/+6
| | * sort out saving empty string IDsAshley Hughes2014-04-011-9/+3
| | * Only allow private keys associated to accounts of an appDominik Schürmann2014-04-011-11/+12
| | * Fully qualified importsDominik Schürmann2014-04-016-19/+96
| * | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-035-31/+12
| |/
| * Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-013-106/+148
| |\
| | * PgpKeyOperation: factor out all android dependenciesVincent Breitmoser2014-04-013-106/+148
| * | default to allow symmetric decryptionDominik Schürmann2014-04-011-1/+1
| |/
| * Fix symmetric decryptionDominik Schürmann2014-04-011-111/+108
| * Fix symmetric encryption and cleanupDominik Schürmann2014-04-011-9/+11
| * More experimental work on decrypt fragmentsDominik Schürmann2014-03-303-22/+30
| * style changesAshley Hughes2014-03-301-27/+26
| * merge masterAshley Hughes2014-03-2911-636/+721
| |\
| | * Fix fingerprint handlingDominik Schürmann2014-03-201-9/+5
| | * Group fingerprint again to make it visually consistentThialfihar2014-03-201-0/+5
| | * put colorize method into key helperDominik Schürmann2014-03-201-0/+86
| | * Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-201-14/+5
| | * Let convertKeyIdToHex handle short key IDsThialfihar2014-03-201-0/+5
| | * add apg's fix for Key id displayuberspot2014-03-191-1/+5
| | * Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-181-2/+2
| | |\
| | | * Keyserver query now uses machine readable output for search and get. Added se...gogowitczak2014-03-151-2/+2
| | * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-181-125/+209
| | |\ \
| | * | | Fix export for new unified key list #409uberspot2014-03-151-30/+39
| | | |/ | | |/|
| * | | all editing cases I can think of now workAshley Hughes2014-03-271-1/+1
| * | | fix for editing master keys and IDs, case of change primary ID and modify mas...Ashley Hughes2014-03-271-3/+29
| * | | allow master key updates by removing old primary ID certAshley Hughes2014-03-251-0/+8
| * | | delete IDs needs to update keyring, flag itAshley Hughes2014-03-251-1/+2
| * | | allow lists to be subkeys or keyringsAshley Hughes2014-03-251-6/+23
| * | | results of debugging, fix several bugs - more needed though...Ashley Hughes2014-03-251-31/+45
| * | | comments, slight change to progress barAshley Hughes2014-03-241-6/+10
| * | | make sure ID info is savedAshley Hughes2014-03-241-3/+10
| * | | work on savingAshley Hughes2014-03-241-22/+23
| * | | move stuff around, save workAshley Hughes2014-03-231-59/+61
| * | | unused importsAshley Hughes2014-03-111-4/+0
| * | | start modifying save codeAshley Hughes2014-03-101-8/+26
| * | | uncomment, use Parcel. Builds, not functionalAshley Hughes2014-03-071-25/+23
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:25:55 +0000