aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain i...Dominik Schürmann2016-03-075-84/+81
|\
| * dependency removedMichal Kepkowski2016-03-051-2/+0
| * okHttpMichal Kepkowski2016-03-044-82/+81
* | Version 3.9.2Dominik Schürmann2016-03-071-2/+2
* | fix get key ids by removing another leftoverDominik Schürmann2016-03-071-1/+0
* | fix bug from leftover line in openpgpserviceVincent Breitmoser2016-03-071-1/+0
* | Version 3.9.1Dominik Schürmann2016-03-062-3/+3
* | Merge pull request #1757 from 007durgesh219/Issue#1752Dominik Schürmann2016-03-061-1/+7
|\ \
| * | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752Durgesh2016-03-061-1/+7
* | | Merge pull request #1747 from runnerway/fix-alreadyaddedDominik Schürmann2016-03-061-2/+2
|\ \ \ | |/ / |/| |
| * | Remove uri from pending even when already addedAndrea Torlaschi2016-03-041-2/+2
* | | Merge pull request #1750 from 007durgesh219/Issue#1746Dominik Schürmann2016-03-051-1/+1
|\ \ \
| * | | Fix Dark theme no longer works in main screen on android 5, Issue#1746Durgesh2016-03-051-1/+1
* | | | Merge pull request #1738 from runnerway/storage-permission-fixDominik Schürmann2016-03-051-1/+8
|\ \ \ \
| * | | | Always check read permissionAndrea Torlaschi2016-03-021-1/+8
* | | | | Merge pull request #1751 from runnerway/decrypt-filenameDominik Schürmann2016-03-052-4/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Set filename after decryptionAndrea Torlaschi2016-03-051-2/+3
| * | | | Extend FileProvider to support name updateAndrea Torlaschi2016-03-051-2/+11
| | |/ / | |/| |
* | | | Merge pull request #1743 from advaita13/masterDominik Schürmann2016-03-031-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Update ContactSyncAdapterService.javaAdvaita2016-03-031-0/+7
| | |/ | |/|
* | | Add missing 2 EUR selection for donationDominik Schürmann2016-03-031-0/+1
* | | Version 3.9Dominik Schürmann2016-03-032-7/+2
* | | Transifex: pt_BRDominik Schürmann2016-03-0398-292/+2894
* | | Update openpgp-api submoduleDominik Schürmann2016-03-031-0/+0
|/ /
* | add v11 to supported api versionsVincent Breitmoser2016-03-021-3/+6
* | update openpgp-api-lib to v11 (closes #1735)Vincent Breitmoser2016-03-021-0/+0
|/
* handle openpgp4fpr intent filter as import rather than certify (see #1661)Vincent Breitmoser2016-03-022-16/+21
* small nullpointer fixVincent Breitmoser2016-03-021-3/+6
* nfc: disable broadcomWorkaround for TagDispatcher to reduce delay (see #1734)Vincent Breitmoser2016-03-021-1/+1
* some changelog for v3.9Vincent Breitmoser2016-03-021-0/+7
* Merge pull request #1737 from runnerway/backup-code-fixDominik Schürmann2016-03-021-5/+6
|\
| * Fix backup code comparisonAndrea Torlaschi2016-03-021-5/+6
|/
* Merge pull request #1615 from open-keychain/external-providerVincent2016-03-0116-291/+797
|\
| * add some license headersVincent Breitmoser2016-02-243-0/+52
| * wipVincent Breitmoser2016-02-241-42/+88
| * add ACTION_CHECK_PERMISSION for a simple permission checkVincent Breitmoser2016-02-242-0/+13
| * external-provider: add permission check for status queryVincent Breitmoser2016-02-244-7/+54
| * external-provider: add (experimental) external providerVincent Breitmoser2016-02-243-1/+272
| * split off ApiDataAccessObject from ProviderHelperVincent Breitmoser2016-02-2411-247/+324
* | Comment out verification for submodulesDominik Schürmann2016-02-291-8/+8
* | Update to support lib 23.2.0Dominik Schürmann2016-02-292-50/+53
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-02-2311-35/+525
|\
| * Merge pull request #1727 from open-keychain/mime-fallbackVincent2016-02-2311-35/+525
| |\
| | * ditch isLikelyText flag, set mimeType to text/plain in that caseVincent Breitmoser2016-02-237-25/+32
| | * add test for CharsetVerifierVincent Breitmoser2016-02-231-0/+141
| | * move CharsetVerifier to utils packageVincent Breitmoser2016-02-233-2/+3
| | * documentation and cleanupVincent Breitmoser2016-02-223-4/+24
| | * displaytext: add "View Log" option, move "Copy to clipboard" into overflow menuVincent Breitmoser2016-02-224-7/+27
| | * decrypt: always show "View in OpenKeychain" as intent chooser option iff isLi...Vincent Breitmoser2016-02-221-0/+12
| | * decryptVerify: use CharsetVerifier to guess whether data is binary or notVincent Breitmoser2016-02-221-10/+19