Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Fix build | Dominik Schürmann | 2014-04-02 | 1 | -0/+2 | |
| | | | ||||||
| | * | Replace wildcard imports with explicit imports | Thialfihar | 2014-04-02 | 13 | -21/+126 | |
| | | | ||||||
| | * | Spacing corrections | Thialfihar | 2014-04-02 | 1 | -3/+2 | |
| | | | ||||||
| | * | Add missing and curly brackets and fix others | Thialfihar | 2014-04-02 | 7 | -60/+61 | |
| | | | | | | | | | | | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own. | |||||
| | * | Rearrange too long lines | Thialfihar | 2014-04-02 | 28 | -145/+228 | |
| | | | ||||||
| | * | Adjust variable/member naming to conform to style guide | Thialfihar | 2014-04-02 | 11 | -79/+82 | |
| | | | | | | | | | | | | | | | 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 guide | Thialfihar | 2014-04-02 | 29 | -85/+87 | |
| | | | ||||||
| | * | Adjust copyright headers | Thialfihar | 2014-04-02 | 6 | -12/+20 | |
| | | | ||||||
| | * | Adjust import order | Thialfihar | 2014-04-02 | 24 | -81/+46 | |
| | | | ||||||
| | * | always ask | Ashley Hughes | 2014-04-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | confirm that empty IDs are really wanted | Ashley Hughes | 2014-04-02 | 1 | -1/+46 | |
| | | | ||||||
| | * | new ID sigs already added, so do save them | Ashley Hughes | 2014-04-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | allow blank IDs, allow adding new IDs and let them be master | Ashley Hughes | 2014-04-02 | 2 | -5/+8 | |
| | | | ||||||
| | * | pass through info that keys are new without relying on new keys orginally ↵ | Ashley Hughes | 2014-04-01 | 5 | -2/+22 | |
| | | | | | | | | | | | | being empty | |||||
| | * | sort out saving empty string IDs | Ashley Hughes | 2014-04-01 | 1 | -9/+3 | |
| | | | ||||||
| | * | Menu cleanup | Dominik Schürmann | 2014-04-01 | 1 | -4/+5 | |
| | | | ||||||
| | * | Dont show encrypted data before decryption from clipboard | Dominik Schürmann | 2014-04-01 | 1 | -7/+14 | |
| | | | ||||||
| | * | Change path to OpenKeychain | Dominik Schürmann | 2014-04-01 | 1 | -3/+8 | |
| | | | ||||||
| | * | Only allow private keys associated to accounts of an app | Dominik Schürmann | 2014-04-01 | 4 | -18/+39 | |
| | | | ||||||
| | * | Cleanup | Dominik Schürmann | 2014-04-01 | 2 | -79/+55 | |
| | | | ||||||
| | * | Automatically select newly created key in api accounts | Dominik Schürmann | 2014-04-01 | 4 | -18/+47 | |
| | | | ||||||
| | * | Fully qualified imports | Dominik Schürmann | 2014-04-01 | 7 | -19/+99 | |
| | | | ||||||
| * | | Break a lot of stuff. Also, database redesign. | Vincent Breitmoser | 2014-04-03 | 25 | -1367/+598 | |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | |||||
| * | Remove DECRYPT_ASSUME_SYMMETRIC | Dominik Schürmann | 2014-04-01 | 2 | -6/+0 | |
| | | ||||||
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 5 | -116/+235 | |
| |\ | ||||||
| | * | PgpKeyOperation: factor out all android dependencies | Vincent Breitmoser | 2014-04-01 | 5 | -116/+235 | |
| | | | | | | | | | | | | | | | | | | 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 decryption | Dominik Schürmann | 2014-04-01 | 1 | -1/+1 | |
| |/ | ||||||
| * | Fix symmetric decryption | Dominik Schürmann | 2014-04-01 | 5 | -117/+117 | |
| | | ||||||
| * | Fix pre-selection for encrypt | Dominik Schürmann | 2014-04-01 | 1 | -4/+2 | |
| | | ||||||
| * | Fix layouts | Dominik Schürmann | 2014-04-01 | 1 | -0/+1 | |
| | | ||||||
| * | Simplify encrypt and sign backend | Dominik Schürmann | 2014-04-01 | 3 | -115/+59 | |
| | | ||||||
| * | Fix symmetric encryption and cleanup | Dominik Schürmann | 2014-04-01 | 8 | -136/+91 | |
| | | ||||||
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 3 | -26/+39 | |
| |\ | ||||||
| | * | don't disable save button, show message if nothing needs to be done | Ashley Hughes | 2014-04-01 | 1 | -3/+4 | |
| | | | ||||||
| | * | create three keys by default | Ashley Hughes | 2014-03-31 | 1 | -1/+8 | |
| | | | ||||||
| | * | change how new default keys are passed back, fix showing their usage flags | Ashley Hughes | 2014-03-31 | 3 | -24/+29 | |
| | | | ||||||
| * | | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 10 | -857/+1265 | |
| |/ | ||||||
| * | Include signature result in fragments | Dominik Schürmann | 2014-03-30 | 5 | -245/+204 | |
| | | ||||||
| * | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 5 | -569/+243 | |
| | | ||||||
| * | compiles again | Dominik Schürmann | 2014-03-30 | 2 | -7/+9 | |
| | | ||||||
| * | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 10 | -375/+623 | |
| | | ||||||
| * | Experiments with fragments in decrypt activity | Dominik Schürmann | 2014-03-30 | 5 | -155/+421 | |
| | | ||||||
| * | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 1 | -3/+0 | |
| | | ||||||
| * | Revert "Remove cancel from app menu" | Dominik Schürmann | 2014-03-30 | 1 | -0/+3 | |
| | | | | | | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4. | |||||
| * | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 1 | -3/+0 | |
| | | ||||||
| * | Remove FLAG_ONE_SHOT from most PIs | Dominik Schürmann | 2014-03-30 | 2 | -6/+6 | |
| | | ||||||
| * | Merge pull request #491 from openpgp-keychain/edit-key | Dominik Schürmann | 2014-03-30 | 13 | -493/+1206 | |
| |\ | | | | | | | Edit key changes | |||||
| | * | style changes | Ashley Hughes | 2014-03-30 | 1 | -27/+26 | |
| | | | ||||||
| | * | revert mistake | Ashley Hughes | 2014-03-29 | 1 | -1/+1 | |
| | | | ||||||
| | * | merge master | Ashley Hughes | 2014-03-29 | 123 | -4249/+5829 | |
| | |\ |