cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-26 12:52:45 +01:00
parent cab52c4013 6a04866ae6
commit 968d051877
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenKeychain/build.gradle
View File

@@ -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

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
View File

@@ -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
*/