Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-13 | 2 | -134/+138 |
|\ | |||||
| * | openpgpservice: move stream closing into delegating method | Vincent Breitmoser | 2015-11-13 | 1 | -131/+90 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-13 | 2 | -21/+94 |
| |\ | |||||
| * | | decrypt: add tests for skipping stripped and unsuitable decryption subkeys | Vincent Breitmoser | 2015-11-13 | 1 | -3/+48 |
| | | | |||||
* | | | Move permission check to createOperationInput | Dominik Schürmann | 2015-11-13 | 1 | -91/+96 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-13 | 7 | -15/+45 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-11-13 | 2 | -18/+18 |
| |\ | |||||
| * \ | Merge commit '816dce0334e8b8d9da3cb00d31d26033b17040a3' | Vincent Breitmoser | 2015-11-13 | 4 | -15/+29 |
| |\ \ | |||||
| | * | | service: minor code cleanups in key retrieval | Vincent Breitmoser | 2015-11-09 | 1 | -12/+5 |
| | | | | |||||
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-09 | 4 | -83/+38 |
| | |\ \ | |||||
| | * | | | import: apply fixPgpMessage to text for import from clipboard | Vincent Breitmoser | 2015-11-06 | 3 | -3/+24 |
| | | | | | |||||
| * | | | | decrypt: skip unavailable and unsuitable keys | Vincent Breitmoser | 2015-11-13 | 3 | -0/+16 |
| | |/ / | |/| | | |||||
* | | | | Request READ_EXTERNAL_STORAGE for decryption | Dominik Schürmann | 2015-11-13 | 2 | -21/+94 |
| |_|/ |/| | | |||||
* | | | Update safeslinger lib | Dominik Schürmann | 2015-11-13 | 1 | -0/+0 |
| | | | |||||
* | | | Update support libs to 23.1.1 | Dominik Schürmann | 2015-11-13 | 1 | -17/+17 |
| | | | |||||
* | | | Use fixed version of mockito | Dominik Schürmann | 2015-11-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-08 | 13 | -12/+367 |
|\| | |||||
| * | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 3 | -5/+54 |
| | | |||||
| * | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 3 | -16/+31 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 22 | -95/+369 |
| |\ | |||||
| * | | bench: simple working benchmark | Vincent Breitmoser | 2015-11-04 | 8 | -20/+52 |
| | | | |||||
| * | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 9 | -1/+260 |
| | | | |||||
* | | | Get whole public key via ACTION_GET_KEY | Dominik Schürmann | 2015-11-08 | 2 | -6/+38 |
| | | | |||||
* | | | Cleanup settings activity | Dominik Schürmann | 2015-11-08 | 2 | -77/+0 |
| |/ |/| | |||||
* | | Add READ_EXTERNAL_STORAGE permission | Dominik Schürmann | 2015-11-03 | 1 | -19/+29 |
| | | |||||
* | | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 15 | -10/+130 |
| | | |||||
* | | Properly hide fab in ViewKeyActivity, fixes #1580 | Dominik Schürmann | 2015-11-02 | 1 | -5/+28 |
| | | |||||
* | | Add travis components for SDK 23 | Dominik Schürmann | 2015-11-02 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-02 | 5 | -55/+168 |
|\ \ | |||||
| * \ | Merge pull request #1578 from open-keychain/keyserver-sync-fix | Dominik Schürmann | 2015-11-02 | 2 | -39/+87 |
| |\ \ | | |/ | |/| | Reworked KeyserverSyncAdapterService | ||||
| | * | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT | Adithya Abraham Philip | 2015-10-31 | 2 | -39/+87 |
| | | | |||||
| * | | keylist: add "search for query" button to empty view | Vincent Breitmoser | 2015-11-02 | 3 | -16/+81 |
| |/ | |||||
* | | Add runtime permission check for QR Code activity | Dominik Schürmann | 2015-11-02 | 1 | -14/+78 |
| | | |||||
* | | Fix API 23 regression for activities without layout, see ↵ | Dominik Schürmann | 2015-11-02 | 3 | -10/+17 |
|/ | | | | http://stackoverflow.com/q/32169303 | ||||
* | comment git dependency again | Dominik Schürmann | 2015-10-29 | 1 | -1/+1 |
| | |||||
* | update material drawer library | Dominik Schürmann | 2015-10-29 | 2 | -44/+46 |
| | |||||
* | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 4 | -20/+36 |
| | | | | (also, use unbounded blocking queue to fix update of more than 10 keys) | ||||
* | import: reduce number of threads a little, and code cleanup | Vincent Breitmoser | 2015-10-29 | 1 | -39/+37 |
| | |||||
* | make use of proxies a Keyserver property | Vincent Breitmoser | 2015-10-29 | 7 | -49/+55 |
| | |||||
* | editkey: always return EditKeyResult | Vincent Breitmoser | 2015-10-29 | 3 | -14/+16 |
| | |||||
* | use Proxy.NO_PROXY instead of null value for no proxy | Vincent Breitmoser | 2015-10-29 | 7 | -22/+27 |
| | |||||
* | encrypttext: fix mimetype check logic (#1574) | Vincent Breitmoser | 2015-10-29 | 1 | -1/+2 |
| | |||||
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 13 | -74/+135 |
| | |||||
* | prevent crashes in EncryptKeyCompletionView (2) | Vincent Breitmoser | 2015-10-26 | 1 | -10/+19 |
| | |||||
* | Target SDK 23 and related fixes | Dominik Schürmann | 2015-10-26 | 6 | -28/+31 |
| | |||||
* | Update stickylistheaders, html-textview | Dominik Schürmann | 2015-10-26 | 1 | -7/+4 |
| | |||||
* | Update tokenautocomplete | Dominik Schürmann | 2015-10-26 | 2 | -21/+20 |
| | |||||
* | Update android-patternview, materialtabstrip, floatingactionbutton | Dominik Schürmann | 2015-10-26 | 2 | -8/+8 |
| | |||||
* | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 5 | -26/+108 |
| | |||||
* | Version 3.6.1 | Dominik Schürmann | 2015-10-26 | 1 | -2/+2 |
| |