diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-26 12:52:45 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-26 13:48:25 +0100 |
| commit | 968d0518772688346f7c8186e75d7e8c6ceda8d4 (patch) | |
| tree | bbd1f2e4004ec81396a681422ce56d9769d0cf5c /OpenKeychain | |
| parent | cab52c401301596cf0ad2646e8172912a5623366 (diff) | |
| parent | 6a04866ae61e6b5cb383e45bdbe29a649e60013f (diff) | |
| download | open-keychain-968d0518772688346f7c8186e75d7e8c6ceda8d4.tar.gz open-keychain-968d0518772688346f7c8186e75d7e8c6ceda8d4.tar.bz2 open-keychain-968d0518772688346f7c8186e75d7e8c6ceda8d4.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/build.gradle | 21 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java | 9 |
2 files changed, 12 insertions, 18 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 73bad1dd8..3312df784 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -161,18 +161,9 @@ android { resValue "string", "account_type", "org.sufficientlysecure.keychain.account" resValue "string", "provider_content_authority", "org.sufficientlysecure.keychain.provider" - // Github API ID and secret are read from gradle.properties (not in git!) - // must use double escaping in gradle.properties! For example: - // githubClientId="\\"7a011b66275f244d3f21\\"" - // githubClientSecret="\\"eaced8a6655719d8c6848396de97b3f5d7a89fec\\"" - if (project.hasProperty('githubClientId') && - project.hasProperty('githubClientSecret')) { - - println "Found github oauth properties" - - buildConfigField "String", "GITHUB_CLIENT_ID", githubClientId - buildConfigField "String", "GITHUB_CLIENT_SECRET", githubClientSecret - } + // Github API + buildConfigField "String", "GITHUB_CLIENT_ID", "\"c942cd81844d94e7e41b\"" + buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"f1dd17e70a0614abbd9310b00a310e23c6c8edff\"" } debug { @@ -186,9 +177,9 @@ android { resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" resValue "string", "provider_content_authority", "org.sufficientlysecure.keychain.debug.provider" - // Github API for debug build only - buildConfigField "String", "GITHUB_CLIENT_ID", "\"7a011b66275f244d3f21\"" - buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"eaced8a6655719d8c6848396de97b3f5d7a89fec\"" + // Github API + buildConfigField "String", "GITHUB_CLIENT_ID", "\"c942cd81844d94e7e41b\"" + buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"f1dd17e70a0614abbd9310b00a310e23c6c8edff\"" // Enable code coverage (Jacoco) testCoverageEnabled true diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java index c4d84a2d4..7345faad9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java @@ -272,9 +272,12 @@ public class FileHelper { return true; } - /** - * A replacement for ContentResolver.openInputStream() that does not allow the usage of - * "file" Uris that point to private files owned by the application only. + /** A replacement for ContentResolver.openInputStream() that does not allow + * the usage of "file" Uris that point to private files owned by the + * application only, *on Lollipop devices*. + * + * The check will be performed on devices >= Lollipop only, which have the + * necessary API to stat filedescriptors. * * @see FileHelperLollipop */ |