aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Rename "pass phrase" to "passphrase"Thialfihar2014-04-021-21/+21
| |
| * Add missing and curly brackets and fix othersThialfihar2014-04-021-5/+10
| | | | | | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own.
| * Rearrange too long linesThialfihar2014-04-025-52/+77
| |
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-021-5/+5
| | | | | | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions.
| * 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 ↵Ashley Hughes2014-04-011-2/+6
| | | | | | | | being empty
| * 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
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change entire database design. This introduces a lot of changes, notably all URIs and almost all projections. Some features (like key deletion) have been simply commented out for now since they need serious reconsideration. There are a couple of new TODOs marking places where more work is needed. The migration path works fine from what I tested. The old database is not deleted for now, ie, it is reimported at every start of the application making all intermediate changes transient. Tested and working (for me): - All activities in the main drawer - Multiselect and Search - ViewKeyActivity, with and without secret key available - CertifyKeyActivity - SelectSecretKeyActivity (from CertifyKeyActivity) - SelectPublicKeyActivity (from encrypt activity) What doesn't work: - Actually certifying keys (pending a TODO in ProviderHelper) - Importing keys doesn't preserve secret keys - "Encrypt to this contact" doesn't pass key - Editing keys. All controls are disabled, I'm not sure why... (is this even my fault?) - Deleting keys What I didn't test: - Key export - API stuff - Creating keys (since editing doesn't even work)
* 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
| | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
* | 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
| | | | | | | | If a short key ID is given, then it should only be displayed as such.
| * 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
| |\ | | | | | | Machine readable output for Keyserver query
| | * Keyserver query now uses machine readable output for search and get. Added ↵gogowitczak2014-03-151-2/+2
| | | | | | | | | | | | separate function for converting algorithm integer ID to String.
| * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-181-125/+209
| |\ \ | | | | | | | | Revamp certify dialogue
| | * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-4/+60
| | | |
| | * | certify: sign individual UIDsVincent Breitmoser2014-03-151-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | direct signing of pubkeys is out for now. not sure how this should be handled, but it's trivial to re-add so leaving this up for discussion for now.
| | * | certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| | |/ | | | | | | | | | note this commit introduces NO semantical changes whatsoever!
| * / Fix export for new unified key list #409uberspot2014-03-151-30/+39
| |/
| * 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
| |
| * fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-113-6/+7
| | | | | | | | imports and throw exceptions
| * 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, ↵uberspot2014-03-071-3/+3
| | | | | | | | simplified some conditionals
| * remove unused imports and unthrown exceptionsuberspot2014-03-072-8/+1
| |
* | 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 ↵Ashley Hughes2014-03-271-3/+29
| | | | | | | | master key props fails
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 09:02:10 +0000