aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata objectVincent Breitmoser2016-02-225-87/+152
| | * mime: try to decode with given charset or utf-8 while file is readVincent Breitmoser2016-02-224-10/+225
* | | Passthrough of data Intent in methods of ApiPendingIntentFactory instead of c...Dominik Schürmann2016-02-233-50/+58
|/ /
* | Merge branch 'unyoungwax-qr-code-fullscreen'Dominik Schürmann2016-02-233-151/+3
|\ \ | |/ |/|
| * Remove AspectRatioImageViewunyoungwax2016-02-232-147/+0
| * Resize QR code properly in landscape orientationunyoungwax2016-02-231-4/+3
|/
* Merge pull request #1722 from open-keychain/api-seperationDominik Schürmann2016-02-2211-200/+408
|\
| * Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-227-44/+53
| * Use FLAG_IMMUTABLEDominik Schürmann2016-02-221-6/+22
| * Move PendingIntent creation into factoryDominik Schürmann2016-02-223-140/+201
| * Split remote methods from activities for better seperationDominik Schürmann2016-02-228-57/+134
| * Extract service parts from SecurityTokenOperationActivityDominik Schürmann2016-02-225-23/+68
|/
* Use BC provider as default oneDominik Schürmann2016-02-211-3/+7
* Split RemoteServiceActivity into multiple activitiesDominik Schürmann2016-02-1512-385/+489
* travis: use new hostname addon instead of workaroundDominik Schürmann2016-02-101-7/+4
* Merge pull request #1716 from open-keychain/backup-v2Dominik Schürmann2016-02-1010-1207/+394
|\
| * Fix landscape orientationDominik Schürmann2016-02-101-0/+199
| * Use non-breaking spaces for backup code MaskedEditTextDominik Schürmann2016-02-103-2/+11
| * Backup format v2: redesign restore dialogDominik Schürmann2016-02-103-134/+34
| * Backup format v2: redesigned backup code fragment with masked edit textDominik Schürmann2016-02-106-1201/+278
| * Add masked-edittext libraryDominik Schürmann2016-02-101-41/+43
|/
* update readme for fdroid flavorVincent2016-02-101-4/+4
* Merge pull request #1708 from open-keychain/performanceVincent2016-02-1018-181/+535
|\
| * Merge branch 'master' into performanceVincent Breitmoser2016-02-10103-436/+571
| |\
| * | performance: add license headers and some documentationVincent Breitmoser2016-02-105-14/+72
| * | performance: use more canonical hashCode implementationVincent Breitmoser2016-02-051-4/+4
| * | performance: fix unit testsVincent Breitmoser2016-02-054-23/+51
| * | performance: avoid expensive getSecretKeyType call, use cached where possibleVincent Breitmoser2016-02-058-145/+152
| * | performance: cache session keys per compatible S2K configurationVincent Breitmoser2016-02-055-6/+266