| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | 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 |
| |\ \
| | |/
| |/| |
|
| | * | 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 http://stackoverflow... | Dominik Schürmann | 2015-11-02 | 3 | -10/+17 |
|/ |
|
* | 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 |
* | 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 | 4 | -26/+29 |
* | 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 |
* | Pull from transifex | Dominik Schürmann | 2015-10-26 | 33 | -127/+248 |
* | 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 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-26 | 2 | -18/+12 |
|\ |
|
| * | Commit Github tokens | Dominik Schürmann | 2015-10-26 | 1 | -15/+6 |
* | | fix FileHelper class for pre-lollipop devices | Vincent Breitmoser | 2015-10-26 | 2 | -43/+86 |
|/ |
|
* | https everywhere | Dominik Schürmann | 2015-10-25 | 1 | -4/+4 |
* | linked: fix crash on <= lollipop | Vincent Breitmoser | 2015-10-25 | 1 | -3/+6 |
* | inputdataoperation: guess filetype from filename for generic application/ mim... | Vincent Breitmoser | 2015-10-23 | 3 | -3/+19 |
* | import: use filesize from content provider on input uri | Vincent Breitmoser | 2015-10-23 | 1 | -3/+3 |
* | decryptlist: use generic file icon for application/octet-stream | Vincent Breitmoser | 2015-10-23 | 1 | -0/+4 |
* | More space for backup code | Dominik Schürmann | 2015-10-22 | 1 | -11/+10 |
* | Sync changelog with transifex | Dominik Schürmann | 2015-10-22 | 19 | -0/+228 |
* | Version 3.6, Changelog 3.6 | Dominik Schürmann | 2015-10-22 | 2 | -2/+14 |
* | fix argument order screwup in FileHelper | Vincent Breitmoser | 2015-10-22 | 3 | -3/+3 |