aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Issue#1605 solvedTedaLIEz2015-12-091-1/+6
* Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_IDfiaxh2015-12-032-5/+4
* encryptkeycompletionview: don't initialize to null on attachVincent Breitmoser2015-11-302-12/+3
* move custm api permission methods into helper class (composition over inherit...Vincent Breitmoser2015-11-272-41/+49
* Pull from transifexDominik Schürmann2015-11-2423-0/+92
* 3.7 changelogDominik Schürmann2015-11-231-0/+4
* Pull from transifexDominik Schürmann2015-11-2348-421/+3509
* externalize notification helper for iconDominik Schürmann2015-11-231-0/+50
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-2310-64/+38
* re-enable contact sync by defaultDominik Schürmann2015-11-232-7/+3
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-236-175/+5
* No need to delete by raw contact idDominik Schürmann2015-11-231-30/+8
* Disable contact sync by default on Android >= 6Dominik Schürmann2015-11-233-35/+36
* Add first time wizard for sync settingsDominik Schürmann2015-11-236-5/+175
* API version 10Dominik Schürmann2015-11-231-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-1918-246/+578
|\
| * 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
| * | 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-15106-871/+1958
| |\| |
| | * | 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-131-131/+90
|\ \ \
| * | | openpgpservice: move stream closing into delegating methodVincent Breitmoser2015-11-131-131/+90
* | | | 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 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
| | |\ \ \