| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ↵ | Dominik Schürmann | 2014-04-03 | 2 | -16/+11 |
| |\ | | | | | | | Valodim-db-overhaul | ||||
| | * | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 3 | -41/+82 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Break a lot of stuff. Also, database redesign. | Vincent Breitmoser | 2014-04-03 | 2 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
| * | | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -13/+0 |
| | |/ |/| | |||||
| * | | Rename "pass phrase" to "passphrase" | Thialfihar | 2014-04-02 | 3 | -16/+16 |
| | | | |||||
| * | | Fix build | Dominik Schürmann | 2014-04-02 | 1 | -0/+2 |
| | | | |||||
| * | | Replace wildcard imports with explicit imports | Thialfihar | 2014-04-02 | 2 | -6/+39 |
| | | | |||||
| * | | Add missing and curly brackets and fix others | Thialfihar | 2014-04-02 | 1 | -5/+4 |
| | | | | | | | | | | | 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 | 1 | -7/+13 |
| | | | |||||
| * | | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 2 | -9/+9 |
| | | | |||||
| * | | Adjust import order | Thialfihar | 2014-04-02 | 2 | -3/+3 |
| | | | |||||
| * | | pass through info that keys are new without relying on new keys orginally ↵ | Ashley Hughes | 2014-04-01 | 1 | -0/+3 |
| | | | | | | | | | being empty | ||||
| * | | Automatically select newly created key in api accounts | Dominik Schürmann | 2014-04-01 | 1 | -0/+1 |
| |/ | |||||
| * | PgpKeyOperation: factor out all android dependencies | Vincent Breitmoser | 2014-04-01 | 1 | -10/+37 |
| | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Fix symmetric decryption | Dominik Schürmann | 2014-04-01 | 1 | -3/+1 |
| | | |||||
| * | Simplify encrypt and sign backend | Dominik Schürmann | 2014-04-01 | 1 | -98/+54 |
| | | |||||
| * | Fix symmetric encryption and cleanup | Dominik Schürmann | 2014-04-01 | 1 | -3/+3 |
| | | |||||
| * | 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 | 1 | -4/+11 |
| | | |||||
| * | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 1 | -28/+29 |
| | | |||||
| * | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 1 | -18/+9 |
| | | |||||
| * | merge master | Ashley Hughes | 2014-03-29 | 13 | -1808/+198 |
| |\ | |||||
| | * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs | ||||
| | * | | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 10 | -1613/+0 |
| | |/ | |||||
| | * | Merge pull request #469 from honnel/save-key-workaround | Dominik Schürmann | 2014-03-23 | 1 | -1/+9 |
| | |\ | | | | | | | Can't save key after key generation | ||||
| | | * | The current implementation of saving new generated key doesn't save the key ↵ | Daniel Hammann | 2014-03-22 | 1 | -1/+9 |
| | | | | | | | | | | | | | due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. | ||||
| | * | | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 1 | -41/+5 |
| | |/ | |||||
| | * | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -2/+2 |
| | | | |||||
| | * | verify downloaded key by comparing fingerprints | Dominik Schürmann | 2014-03-20 | 1 | -35/+45 |
| | | | |||||
| | * | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 1 | -1/+1 |
| | | | |||||
| | * | use correct LongSparseArray for minimum api level | Alexander Sulfrian | 2014-03-19 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 1 | -3/+6 |
| | |\ | | | | | | | Revamp certify dialogue | ||||
| | | * | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 1 | -2/+3 |
| | | | | |||||
| | | * | certify: sign individual UIDs | Vincent Breitmoser | 2014-03-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | 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: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled. | ||||
| | * | | Fix export for new unified key list #409 | uberspot | 2014-03-15 | 1 | -24/+26 |
| | |/ | |||||
| | * | Fix code style in keychain/service/ | uberspot | 2014-03-13 | 11 | -87/+129 |
| | | | |||||
| | * | Optimize imports in all files, remove useless whitespace in some and fix ↵ | uberspot | 2014-03-13 | 11 | -128/+80 |
| | | | | | | | | | indentation | ||||
| | * | Export cancellable - minor changes | grait | 2014-03-13 | 1 | -1/+2 |
| | | | |||||
| | * | Export is cancellable now | grait | 2014-03-13 | 1 | -2/+12 |
| | | | |||||
| | * | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵ | uberspot | 2014-03-11 | 1 | -2/+3 |
| | | | | | | | | | imports and throw exceptions | ||||
| | * | Make export work with rowIds instead of MasterKeyIds | uberspot | 2014-03-11 | 1 | -9/+15 |
| | | | |||||
| | * | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵ | uberspot | 2014-03-11 | 2 | -6/+6 |
| | | | | | | | | | via the method calls | ||||
| | * | getString before init of KeychainIntentHandler | Dominik Schürmann | 2014-03-10 | 1 | -46/+34 |
| | | | |||||
| | * | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 |
| | | | |||||
| | * | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 2 | -6/+25 |
| | | | |||||
| | * | progress bar while key creation - added plurals based on no.of keys while ↵ | grait | 2014-03-09 | 1 | -1/+2 |
| | | | | | | | | | key creation | ||||
| | * | progress is shown when creating the default key based on number of keys ↵ | grait | 2014-03-08 | 1 | -0/+7 |
| | | | | | | | | | created so far | ||||
| | * | remove unused imports and unthrown exceptions | uberspot | 2014-03-07 | 1 | -1/+0 |
| | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |