aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-1919-251/+592
|\
| * Merge pull request #1543 from rohands/issue_mouseover_hintsVincent2015-11-166-1/+126
| |\
| | * Class names and string names are updatedrohands2015-09-226-18/+20
| | * Updatedrohands2015-09-205-6/+27
| | * Mousehintsrohands2015-09-204-0/+102
| * | fix unit tests (IllegalStateException)Vincent Breitmoser2015-11-161-5/+14
| * | decryptlist: fix iteratorsVincent Breitmoser2015-11-151-4/+12
| * | fix delete file securely method and use for delete original fileVincent Breitmoser2015-11-153-70/+58
| * | add documentation on marker packet skippingVincent2015-11-151-1/+9
| * | Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-151-3/+1
| |\ \
| | * | fix accidental commit (thought I had removed that)Vincent Breitmoser2015-11-151-3/+1
| * | | Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-15108-940/+2066
| |\| |
| | * | allow database downgrade for debug buildsVincent Breitmoser2015-11-151-0/+4
| | * | some optimizations and indexes for the main key list queryVincent Breitmoser2015-11-153-15/+23
| | * | provider: add debug variable to explain query plansVincent Breitmoser2015-11-152-4/+29
| | * | decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-156-13/+35
| | * | inputdataop: leave content as-is if no header found (fixes #1592)Vincent Breitmoser2015-11-141-0/+9
| | * | decryptlist: minor cleanups and documentationVincent Breitmoser2015-11-141-7/+30
| | * | decryptlist: some cleanup and streamlining of control flowVincent Breitmoser2015-11-141-81/+84
| * | | decryptlist: re-decrypt after key lookupVincent Breitmoser2015-10-232-8/+16
| * | | decryptlist: implement key lookup (wip)Vincent Breitmoser2015-10-233-51/+154
* | | | Check if NFC is available before displaying buttonDominik Schürmann2015-11-191-3/+5
| |/ / |/| |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-132-134/+138
|\ \ \
| * | | openpgpservice: move stream closing into delegating methodVincent Breitmoser2015-11-131-131/+90
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-132-21/+94
| |\ \ \
| * | | | decrypt: add tests for skipping stripped and unsuitable decryption subkeysVincent Breitmoser2015-11-131-3/+48
* | | | | Move permission check to createOperationInputDominik Schürmann2015-11-131-91/+96
| |/ / / |/| | |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-137-15/+45
|\| | |
| * | | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-11-131-18/+18
| |\ \ \
| * \ \ \ Merge commit '816dce0334e8b8d9da3cb00d31d26033b17040a3'Vincent Breitmoser2015-11-134-15/+29
| |\ \ \ \
| | * | | | service: minor code cleanups in key retrievalVincent Breitmoser2015-11-091-12/+5
| | * | | | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-093-83/+38
| | |\ \ \ \
| | * | | | | import: apply fixPgpMessage to text for import from clipboardVincent Breitmoser2015-11-063-3/+24
| * | | | | | decrypt: skip unavailable and unsuitable keysVincent Breitmoser2015-11-133-0/+16
| | |/ / / / | |/| | | |
* | | | | | Request READ_EXTERNAL_STORAGE for decryptionDominik Schürmann2015-11-132-21/+94
| |_|/ / / |/| | | |
* | | | | Update support libs to 23.1.1Dominik Schürmann2015-11-131-17/+17
* | | | | Use fixed version of mockitoDominik Schürmann2015-11-131-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-0813-12/+367
|\| | |
| * | | bench: add simple s2k benchmark (iterations for 100ms)Vincent Breitmoser2015-11-043-5/+54
| * | | bench: run ops multiple times and for an average timeVincent Breitmoser2015-11-043-16/+31
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-0417-89/+300
| |\ \ \
| * | | | bench: simple working benchmarkVincent Breitmoser2015-11-048-20/+52
| * | | | bench: add benchmark operation for testingVincent Breitmoser2015-11-049-1/+260
* | | | | Get whole public key via ACTION_GET_KEYDominik Schürmann2015-11-081-6/+38
* | | | | Cleanup settings activityDominik Schürmann2015-11-082-77/+0
| |/ / / |/| | |
* | | | Add READ_EXTERNAL_STORAGE permissionDominik Schürmann2015-11-031-19/+29
* | | | Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-0211-4/+63
* | | | Properly hide fab in ViewKeyActivity, fixes #1580Dominik Schürmann2015-11-021-5/+28
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-025-55/+168
|\ \ \ \
| * \ \ \ Merge pull request #1578 from open-keychain/keyserver-sync-fixDominik Schürmann2015-11-022-39/+87
| |\ \ \ \ | | |/ / / | |/| | |