Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-19 | 18 | -246/+578 |
|\ | |||||
| * | Merge pull request #1543 from rohands/issue_mouseover_hints | Vincent | 2015-11-16 | 6 | -1/+126 |
| |\ | | | | | | | mouseover hints | ||||
| | * | Class names and string names are updated | rohands | 2015-09-22 | 6 | -18/+20 |
| | | | |||||
| | * | Updated | rohands | 2015-09-20 | 5 | -6/+27 |
| | | | |||||
| | * | Mousehints | rohands | 2015-09-20 | 4 | -0/+102 |
| | | | |||||
| * | | decryptlist: fix iterators | Vincent Breitmoser | 2015-11-15 | 1 | -4/+12 |
| | | | |||||
| * | | fix delete file securely method and use for delete original file | Vincent Breitmoser | 2015-11-15 | 3 | -70/+58 |
| | | | |||||
| * | | add documentation on marker packet skipping | Vincent | 2015-11-15 | 1 | -1/+9 |
| | | | |||||
| * | | Merge branch 'master' into v/decrypt-key-lookup | Vincent Breitmoser | 2015-11-15 | 1 | -3/+1 |
| |\ \ | |||||
| | * | | fix accidental commit (thought I had removed that) | Vincent Breitmoser | 2015-11-15 | 1 | -3/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into v/decrypt-key-lookup | Vincent Breitmoser | 2015-11-15 | 106 | -871/+1958 |
| |\| | | |||||
| | * | | allow database downgrade for debug builds | Vincent Breitmoser | 2015-11-15 | 1 | -0/+4 |
| | | | | |||||
| | * | | some optimizations and indexes for the main key list query | Vincent Breitmoser | 2015-11-15 | 3 | -15/+23 |
| | | | | |||||
| | * | | provider: add debug variable to explain query plans | Vincent Breitmoser | 2015-11-15 | 2 | -4/+29 |
| | | | | |||||
| | * | | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 6 | -13/+35 |
| | | | | |||||
| | * | | inputdataop: leave content as-is if no header found (fixes #1592) | Vincent Breitmoser | 2015-11-14 | 1 | -0/+9 |
| | | | | |||||
| | * | | decryptlist: minor cleanups and documentation | Vincent Breitmoser | 2015-11-14 | 1 | -7/+30 |
| | | | | |||||
| | * | | decryptlist: some cleanup and streamlining of control flow | Vincent Breitmoser | 2015-11-14 | 1 | -81/+84 |
| | | | | |||||
| * | | | decryptlist: re-decrypt after key lookup | Vincent Breitmoser | 2015-10-23 | 2 | -8/+16 |
| | | | | |||||
| * | | | decryptlist: implement key lookup (wip) | Vincent Breitmoser | 2015-10-23 | 3 | -51/+154 |
| | | | | |||||
* | | | | Check if NFC is available before displaying button | Dominik Schürmann | 2015-11-19 | 1 | -3/+5 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-13 | 1 | -131/+90 |
|\ \ \ | |||||
| * | | | openpgpservice: move stream closing into delegating method | Vincent Breitmoser | 2015-11-13 | 1 | -131/+90 |
| | | | | |||||
* | | | | 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 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 | 3 | -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 |
|/ / / / | |||||
* | | | | 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 | 17 | -89/+300 |
| |\ \ \ | |||||
| * | | | | 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 | 1 | -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 | 11 | -4/+63 |
| | | | | |||||
* | | | | Properly hide fab in ViewKeyActivity, fixes #1580 | Dominik Schürmann | 2015-11-02 | 1 | -5/+28 |
| | | | | |||||
* | | | | 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 | ||||
* | | | update material drawer library | Dominik Schürmann | 2015-10-29 | 1 | -22/+20 |
| | | | |||||
* | | | 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) |