Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-26 | 1 | -3/+6 | |
|\ \ \ | ||||||
* | | | | fix FileHelper class for pre-lollipop devices | Vincent Breitmoser | 2015-10-26 | 2 | -43/+86 | |
|/ / / | ||||||
* / / | linked: fix crash on <= lollipop | Vincent Breitmoser | 2015-10-25 | 1 | -3/+6 | |
|/ / | ||||||
* | | inputdataoperation: guess filetype from filename for generic application/ ↵ | Vincent Breitmoser | 2015-10-23 | 2 | -3/+18 | |
| | | | | | | | | mime types | |||||
* | | 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 | |
| | | ||||||
* | | fix argument order screwup in FileHelper | Vincent Breitmoser | 2015-10-22 | 3 | -3/+3 | |
| | | ||||||
* | | Fix keybase verification | Dominik Schürmann | 2015-10-21 | 1 | -20/+17 | |
| | | ||||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-10-21 | 6 | -8/+75 | |
|\ \ | ||||||
| * | | decrypt: special case single encrypted text -> directly display text, if not ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -0/+23 | |
| | | | | | | | | | | | | too large | |||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-21 | 1 | -2/+2 | |
| |\ \ | ||||||
| * | | | encrypttext: localization, and truncate overlong input | Vincent Breitmoser | 2015-10-21 | 1 | -2/+6 | |
| | | | | ||||||
| * | | | encrypttext: handle input via Intent.EXTRA_STREAM in addition to ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -6/+34 | |
| | | | | | | | | | | | | | | | | Intent.EXTRA_TEXT | |||||
| * | | | displaytextactivity: truncate displayed text if too long | Vincent Breitmoser | 2015-10-21 | 2 | -0/+11 | |
| | | | | ||||||
| * | | | fix crash due to malformed log entry | Vincent Breitmoser | 2015-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | re-add accidentally deleted string | Vincent Breitmoser | 2015-10-21 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Improve file handling in TemporaryFileProvider | Dominik Schürmann | 2015-10-21 | 1 | -16/+21 | |
| |/ / |/| | | ||||||
* | | | SHA1 and RIPEMD160 are not declared insecure until widely deployed | Dominik Schürmann | 2015-10-21 | 1 | -2/+2 | |
|/ / | ||||||
* | | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 3 | -6/+38 | |
| | | ||||||
* | | UI preparations for yubikey reset | Dominik Schürmann | 2015-10-16 | 2 | -31/+68 | |
| | | ||||||
* | | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 6 | -53/+0 | |
| | |