aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* API version 10Dominik Schürmann2015-11-232-1/+1
* Fix potential NPEDominik Schürmann2015-11-231-2/+2
* Show notification when READ_CONTACTS permission is denied in sync service, hi...Dominik Schürmann2015-11-2316-47/+148
* Request contact permission in settings for contact linkingDominik Schürmann2015-11-232-10/+69
* Request READ_EXTERNAL_STORAGE permission on key importDominik Schürmann2015-11-191-11/+77
* FileHelperLollipop: Check by comparing UID instead of checking files read per...Dominik Schürmann2015-11-191-14/+4
* Handle denied storage permission, use ContentResolver.SCHEME_FILE constantDominik Schürmann2015-11-195-8/+30
* Request READ_EXTERNAL_STORAGE permission for encryption of files (shared by f...Dominik Schürmann2015-11-192-37/+108
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-1921-252/+594
|\
| * 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
| * | travis: add --stacktrace parameterVincent Breitmoser2015-11-161-1/+1
| * | 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 pull request #1591 from waffle-iron/masterVincent2015-11-151-0/+1
| |\ \
| | * | add waffle.io badgeMaking GitHub Delicious2015-11-131-0/+1
| * | | Merge pull request #1564 from open-keychain/v/decrypt-key-lookupVincent2015-11-153-56/+167
| |\ \ \
| | * \ \ 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-15118-949/+2138
| | |\ \ \ | | |/ / / | |/| | |
| * | | | 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-132-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-094-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 safeslinger libDominik Schürmann2015-11-131-0/+0
* | | | | Update support libs to 23.1.1Dominik Schürmann2015-11-131-17/+17
* | | | | Use fixed version of mockitoDominik Schürmann2015-11-131-1/+1
|/ / / /