Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 55 | -696/+1571 |
|\| | |||||
| * | 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 | 5 | -12/+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 |
| | | |||||
| * | 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 | 6 | -15/+43 |
| |\ | |||||
| | * | 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 | 2 | -73/+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 | 2 | -0/+14 |
| | | |/ | | |/| | |||||
| * / | | 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 | 11 | -12/+351 |
| |\| | |||||
| | * | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 2 | -3/+50 |
| | | | |||||
| | * | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 2 | -16/+29 |
| | | | |||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 6 | -62/+241 |
| | |\ | |||||
| | * | | bench: simple working benchmark | Vincent Breitmoser | 2015-11-04 | 7 | -20/+47 |
| | | | | |||||
| | * | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 7 | -1/+253 |
| | | | | |||||
| * | | | 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 | 1 | -67/+0 |
| | |/ | |/| | |||||
| * | | Support for Android 6 ACTION_PROCESS_TEXT | Dominik Schürmann | 2015-11-02 | 2 | -4/+48 |
| | | | |||||
| * | | 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 | 3 | -53/+138 |
| |\ \ | |||||
| | * \ | 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 | 1 | -14/+51 |
| | |/ | |||||
| * / | Add runtime permission check for QR Code activity | Dominik Schürmann | 2015-11-02 | 1 | -14/+78 |
| |/ | |||||
| * | 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) | ||||
| * | 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 | 6 | -21/+26 |
| | | |||||
| * | encrypttext: fix mimetype check logic (#1574) | Vincent Breitmoser | 2015-10-29 | 1 | -1/+2 |
| | | |||||
| * | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 11 | -66/+120 |
| | | |||||
| * | 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 | 2 | -8/+6 |
| | | |||||
| * | Update tokenautocomplete | Dominik Schürmann | 2015-10-26 | 1 | -15/+13 |
| | | |||||
| * | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 2 | -6/+75 |
| | | |||||
| * | import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadException | Vincent Breitmoser | 2015-10-26 | 2 | -49/+44 |
| | | |||||
| * | decrypt: restart operation if interrupted by fragment recreation | Vincent Breitmoser | 2015-10-26 | 1 | -15/+12 |
| | |