Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested) | Dominik Schürmann | 2014-04-11 | 8 | -66/+66 |
| | |||||
* | Prettify view_key_userids_item | Dominik Schürmann | 2014-04-11 | 1 | -4/+4 |
| | |||||
* | Prettify more layouts | Dominik Schürmann | 2014-04-11 | 5 | -104/+100 |
| | |||||
* | Merge pull request #553 from Valodim/split-masterKeyId | Dominik Schürmann | 2014-04-11 | 15 | -244/+244 |
|\ | | | | | Split master key & partial fix for uid order | ||||
| * | split getMasterKeyId for the remaining use cases | Vincent Breitmoser | 2014-04-11 | 5 | -16/+19 |
| | | | | | | | | Closes #549 | ||||
| * | get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString | Vincent Breitmoser | 2014-04-11 | 7 | -88/+101 |
| | | |||||
| * | fix EditKeyActivity | Vincent Breitmoser | 2014-04-11 | 2 | -50/+46 |
| | | |||||
| * | display correct primary user id in import dialogue MOSTLY | Vincent Breitmoser | 2014-04-10 | 2 | -21/+41 |
| | | | | | | | | | | | | | | | | This is an incomplete fix; due to use of machine readable output, there is no way to know the primary user id for keys fetched from a key server. Pending https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index | ||||
| * | remove drawer layout remnants from import key dialogue | Vincent Breitmoser | 2014-04-10 | 3 | -78/+46 |
|/ | |||||
* | use view holder pattern in KeyListFragment | Vincent Breitmoser | 2014-04-10 | 1 | -36/+49 |
| | | | | Closes #551 | ||||
* | Merge pull request #550 from Valodim/select-fragment | Dominik Schürmann | 2014-04-10 | 7 | -138/+212 |
|\ | | | | | Select*KeyFragment rewrites | ||||
| * | Select*KeyFragment rewrites | Vincent Breitmoser | 2014-04-10 | 7 | -138/+212 |
|/ | | | | | | | | | | - moved all specific Public/Secret logic from the Adapter class into inner subclasses in the Fragments - more versatile status display ("revoked", "expired", "can certify"...) - applied view holder pattern - query logic, including subqueries, moved into provider classes Closes #375 | ||||
* | ViewCertActivity cleanup | Vincent Breitmoser | 2014-04-10 | 3 | -15/+19 |
| | | | | Closes #547 | ||||
* | Disable selection of user ids and keys in view key | Dominik Schürmann | 2014-04-10 | 3 | -2/+35 |
| | |||||
* | Minimize use of class variables in ViewKey | Dominik Schürmann | 2014-04-10 | 1 | -6/+6 |
| | |||||
* | Cleanup AsyncTask code for NFC | Dominik Schürmann | 2014-04-10 | 1 | -6/+8 |
| | |||||
* | Cleanup imports | Dominik Schürmann | 2014-04-10 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-10 | 2 | -10/+11 |
|\ | |||||
| * | Merge pull request #545 from danielhass/toast_replacement | Dominik Schürmann | 2014-04-10 | 2 | -10/+11 |
| |\ | | | | | | | Toast replacement | ||||
| | * | Deleted wrong AppMsg | Daniel Haß | 2014-04-10 | 1 | -3/+0 |
| | | | |||||
| | * | Replaced Toasts in ViewKeyActivity | Daniel Haß | 2014-04-09 | 1 | -7/+11 |
| | | | |||||
| | * | Removed unused Toast import in ViewKeyActivityJB | Daniel Haß | 2014-04-09 | 1 | -1/+0 |
| | | | |||||
| | * | Replaced Toasts in ImportKeysOrCodeFragment | Daniel Haß | 2014-04-09 | 1 | -3/+3 |
| | | | |||||
* | | | Integrate NFC functionality into ViewKeyActivity | Dominik Schürmann | 2014-04-10 | 4 | -157/+111 |
|/ / | |||||
* | | Prettify more layouts, fix edit and encrypt intents from key view | Dominik Schürmann | 2014-04-09 | 6 | -19/+35 |
| | | |||||
* | | Temporary disable of master key id extraction from uri | Dominik Schürmann | 2014-04-09 | 1 | -7/+7 |
| | | |||||
* | | Prettify some layouts | Dominik Schürmann | 2014-04-09 | 6 | -48/+45 |
| | | |||||
* | | certs: fix verification in ViewKeyActivity (how embarassing) | Vincent Breitmoser | 2014-04-09 | 1 | -2/+2 |
| | | | | | | | | Fixes #541 | ||||
* | | Fix gitignore for lint | Dominik Schürmann | 2014-04-09 | 2 | -6/+5 |
| | | |||||
* | | Fix certification layout | Dominik Schürmann | 2014-04-09 | 1 | -29/+21 |
| | | |||||
* | | Fix NFC | Dominik Schürmann | 2014-04-09 | 2 | -45/+50 |
| | | |||||
* | | Fix save keyring, improve signature verification | Dominik Schürmann | 2014-04-09 | 6 | -101/+108 |
|/ | |||||
* | Cleanup in SelectKeyCursorAdapter | Dominik Schürmann | 2014-04-09 | 2 | -9/+3 |
| | |||||
* | Hide keyboard after hiding custom key length field | Dominik Schürmann | 2014-04-09 | 1 | -1/+9 |
| | |||||
* | Merge pull request #539 from gogowitczak/custom-key-length-info | Dominik Schürmann | 2014-04-09 | 4 | -41/+111 |
|\ | | | | | Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions. | ||||
| * | Modified Spinner values for CreateKeyDialog. Added info for user about ↵ | gogowitczak | 2014-04-08 | 4 | -41/+111 |
| | | | | | | | | custom key length restrictions. | ||||
* | | KeychainIntentService instead of APG | Dominik Schürmann | 2014-04-09 | 1 | -1/+1 |
| | | |||||
* | | Fix DECRYPT and SEND intent | Dominik Schürmann | 2014-04-09 | 1 | -1/+1 |
| | | |||||
* | | Use NotFoundException in more places | Dominik Schürmann | 2014-04-08 | 12 | -85/+141 |
| | | |||||
* | | Fix decryption of messages/files encrypted for multiple public keys | Dominik Schürmann | 2014-04-08 | 1 | -31/+56 |
| | | |||||
* | | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 12 | -128/+152 |
|/ | |||||
* | Merge pull request #537 from thi/change-license-to-gpl | Dominik Schürmann | 2014-04-08 | 45 | -444/+480 |
|\ | | | | | Change license to gpl | ||||
| * | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 43 | -403/+439 |
| | | |||||
| * | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 41 | -49/+49 |
|/ | |||||
* | Merge pull request #536 from gogowitczak/custom-key-length | Dominik Schürmann | 2014-04-08 | 4 | -22/+152 |
|\ | | | | | Added possibility to enter custom key length. | ||||
| * | Fixed coding style. | gogowitczak | 2014-04-08 | 1 | -3/+6 |
| | | |||||
| * | Added possibility to enter custom key length. Added key length limitations, ↵ | gogowitczak | 2014-04-07 | 4 | -22/+149 |
| | | | | | | | | according to issue #102 and SpongyCastle specification. | ||||
* | | Merge pull request #531 from danielhass/toast_replacement | Dominik Schürmann | 2014-04-07 | 1 | -8/+9 |
|\ \ | |/ |/| | Futher Toast replacements | ||||
| * | Futher Toast replacements in CertifyKeyActivity | Daniel Haß | 2014-04-07 | 1 | -8/+9 |
|/ | |||||
* | Merge pull request #529 from gogowitczak/gradlebug-branch | Dominik Schürmann | 2014-04-06 | 1 | -13/+13 |
|\ | | | | | Fixed gradle localTest bug on Windows. |