Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 9 | -143/+163 |
|\ | |||||
| * | title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 |
| * | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ... | Dominik Schürmann | 2014-04-03 | 26 | -1407/+635 |
| |\ | |||||
| * | | 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 | 2 | -7/+16 |
| * | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 8 | -132/+141 |
* | | | db-overhaul: different hack for type info (api level problem inside) | Vincent Breitmoser | 2014-04-04 | 1 | -18/+6 |
* | | | calculate nfc packet on demand only | Vincent Breitmoser | 2014-04-04 | 1 | -20/+18 |
* | | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 6 | -9/+23 |
* | | | db-overhaul: reintroduce by-mail and by-subkey queries | Vincent Breitmoser | 2014-04-04 | 5 | -78/+109 |
* | | | db-overhaul: minor stuff, mostly ProviderHelper | Vincent Breitmoser | 2014-04-04 | 8 | -78/+73 |
* | | | db-overhaul: more work on new provider | Vincent Breitmoser | 2014-04-03 | 10 | -263/+208 |
* | | | more work on streamlining uris, and stripping ProviderHelper | Vincent Breitmoser | 2014-04-03 | 10 | -223/+148 |
* | | | ditch useless PgpKeyHelper.getMasterKey methods | Vincent Breitmoser | 2014-04-03 | 7 | -100/+23 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 70 | -702/+1021 |
|\| | |||||
| * | Cleanup DrawerActivity | Dominik Schürmann | 2014-04-03 | 1 | -31/+4 |
| * | Rename "canEdit" to "canBeEdited" | Thialfihar | 2014-04-02 | 4 | -13/+13 |
| * | Rename "armour" to "armor" | Thialfihar | 2014-04-02 | 4 | -16/+16 |
| * | Rename "pass phrase" to "passphrase" | Thialfihar | 2014-04-02 | 10 | -73/+73 |
| * | 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 |
| * | 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 |
| * | 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 bei... | Ashley Hughes | 2014-04-01 | 5 | -2/+22 |
| * | 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 |
|/ | |||||
* | 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 |
* | | 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 |