Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-19 | 5 | -151/+366 |
|\ | |||||
| * | Merge pull request #1543 from rohands/issue_mouseover_hints | Vincent | 2015-11-16 | 3 | -0/+114 |
| |\ | | | | | | | mouseover hints | ||||
| | * | Class names and string names are updated | rohands | 2015-09-22 | 3 | -9/+9 |
| | | | |||||
| | * | Updated | rohands | 2015-09-20 | 3 | -5/+21 |
| | | | |||||
| | * | Mousehints | rohands | 2015-09-20 | 3 | -0/+98 |
| | | | |||||
| * | | 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 | 1 | -21/+6 |
| | | | |||||
| * | | Merge branch 'master' into v/decrypt-key-lookup | Vincent Breitmoser | 2015-11-15 | 17 | -243/+573 |
| |\ \ | |||||
| | * | | some optimizations and indexes for the main key list query | Vincent Breitmoser | 2015-11-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | 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 | 1 | -8/+14 |
| | | | | |||||
| * | | | decryptlist: implement key lookup (wip) | Vincent Breitmoser | 2015-10-23 | 2 | -38/+114 |
| | | | | |||||
* | | | | Check if NFC is available before displaying button | Dominik Schürmann | 2015-11-19 | 1 | -3/+5 |
| |/ / |/| | | |||||
* | | | 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 | 2 | -2/+9 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-09 | 1 | -67/+0 |
| |\ \ \ | |||||
| * | | | | import: apply fixPgpMessage to text for import from clipboard | Vincent Breitmoser | 2015-11-06 | 2 | -2/+9 |
| | | | | | |||||
* | | | | | 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 | 1 | -0/+44 |
|\| | | | |||||
| * | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 4 | -23/+154 |
| |\ \ \ | |||||
| * | | | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 1 | -0/+44 |
| | | | | | |||||
* | | | | | 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 | 1 | -14/+51 |
|\| | | | |||||
| * | | | 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 | 2 | -3/+8 |
| | | | | | | | | | | | | (also, use unbounded blocking queue to fix update of more than 10 keys) | ||||
* | | | encrypttext: fix mimetype check logic (#1574) | Vincent Breitmoser | 2015-10-29 | 1 | -1/+2 |
| | | | |||||
* | | | 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 | 1 | -5/+4 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | linked: fix crash on <= lollipop | Vincent Breitmoser | 2015-10-25 | 1 | -3/+6 |
|/ / | |||||
* | | 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 | 2 | -2/+2 |
| | | |||||
* | | decrypt: special case single encrypted text -> directly display text, if not ↵ | Vincent Breitmoser | 2015-10-21 | 1 | -0/+23 |
| | | | | | | | | too large | ||||
* | | 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 | 1 | -0/+8 |
| | | |||||
* | | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 2 | -5/+32 |
| | | |||||
* | | UI preparations for yubikey reset | Dominik Schürmann | 2015-10-16 | 2 | -31/+68 |
| | | |||||
* | | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 3 | -34/+0 |
| | | |||||
* | | Clear cache when PIN is too short | Dominik Schürmann | 2015-10-16 | 2 | -12/+7 |
| | | |||||
* | | Prevent nfc dialog from closing when touching outside of it, add cancel button | Dominik Schürmann | 2015-10-16 | 3 | -6/+16 |
| | |