Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 13 | -2169/+0 |
| | |||||
* | Optimize comments, remove dead code | Dominik Schürmann | 2014-04-06 | 6 | -47/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 1 | -2/+16 |
|\ | |||||
| * | Simplify PassphraseDialogFragment usage | Thialfihar | 2014-04-04 | 1 | -2/+16 |
| | | | | | | | | | | Move boiler plate code into a simple static show() method, which only requires a Handler and can be used ad hoc in any FragmentActivity. | ||||
* | | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 1 | -10/+12 |
|\| | |||||
| * | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ↵ | Dominik Schürmann | 2014-04-03 | 2 | -5/+4 |
| |\ | | | | | | | | | | Valodim-db-overhaul | ||||
| * | | Changelog | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 |
| | | | |||||
| * | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 1 | -5/+7 |
| | | | |||||
| * | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 1 | -5/+5 |
| | | | |||||
* | | | db-overhaul: reintroduce by-mail and by-subkey queries | Vincent Breitmoser | 2014-04-04 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | the only thing left to fix after the db upgrade (that I can think of right now) are key exports | ||||
* | | | db-overhaul: minor stuff, mostly ProviderHelper | Vincent Breitmoser | 2014-04-04 | 1 | -3/+4 |
| | | | |||||
* | | | more work on streamlining uris, and stripping ProviderHelper | Vincent Breitmoser | 2014-04-03 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 7 | -18/+45 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Rearrange too long lines | Thialfihar | 2014-04-02 | 3 | -7/+14 |
| | | |||||
| * | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 1 | -1/+1 |
| | | |||||
| * | Adjust import order | Thialfihar | 2014-04-02 | 3 | -8/+0 |
| | | |||||
| * | Only allow private keys associated to accounts of an app | Dominik Schürmann | 2014-04-01 | 2 | -5/+9 |
| | | |||||
| * | Automatically select newly created key in api accounts | Dominik Schürmann | 2014-04-01 | 1 | -2/+27 |
| | | |||||
* | | Break a lot of stuff. Also, database redesign. | Vincent Breitmoser | 2014-04-03 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
* | Fix symmetric decryption | Dominik Schürmann | 2014-04-01 | 1 | -3/+2 |
| | |||||
* | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 1 | -2/+2 |
| | |||||
* | 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 |
| | |||||
* | Rename layouts for remote activity | Dominik Schürmann | 2014-03-26 | 1 | -4/+4 |
| | |||||
* | Accounts list prettified | Dominik Schürmann | 2014-03-26 | 2 | -1/+27 |
| | |||||
* | Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT | Dominik Schürmann | 2014-03-26 | 4 | -51/+50 |
| | |||||
* | Forgot resource | Dominik Schürmann | 2014-03-26 | 1 | -12/+0 |
| | |||||
* | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 2 | -55/+41 |
| | |||||
* | Accounts API, user interface | Dominik Schürmann | 2014-03-26 | 4 | -91/+194 |
| | |||||
* | Fix constraints and insert | Dominik Schürmann | 2014-03-26 | 1 | -1/+1 |
| | |||||
* | Return account creation intent if account does not exists in db | Dominik Schürmann | 2014-03-25 | 3 | -25/+53 |
| | |||||
* | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 3 | -26/+80 |
| | |||||
* | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 11 | -245/+614 |
| | |||||
* | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 10 | -0/+1618 |