summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-08 19:56:43 +0200
committerParménides GV <parmegv@sdf.org>2015-06-08 20:04:03 +0200
commitb0a0805ab81aaa4e204ecfc77d3a6a7f7ed66b2f (patch)
tree7ebeb40d0c74a8c431b7845e403cb1add5e63be4 /app/build.gradle
parent8d39fbdb4980c95268249f21f3c6b8e36b22cf90 (diff)
s/buildtype/flavor, changed riseup's pin
Riseup's EE certificate expired (EE = End-Entity, the commercial certificate signed by the issuer), and we weren't able to fetch provider.json because the pin wasn't valid. This problem needs to be avoided in the future, using HKPK (https://tools.ietf.org/html/rfc7469), which Micah's implementing on Riseup. Switching from build types from flavors enables us to run tests against production apk, not just debug. I didn't detect this pinning problem because tests were run only against the debug apk, which trusted preseeded providers by default (thus bypassing pinning issue).
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle18
1 files changed, 13 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 0f73442c..994f8b7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,4 @@
-apply plugin: 'android'
-import org.ajoberstar.grgit.Grgit
+apply plugin: 'com.android.application'
android {
compileSdkVersion 21
@@ -14,6 +13,15 @@ android {
}
}
+ productFlavors {
+ production {
+
+ }
+ insecure {
+
+ }
+ }
+
buildTypes {
release {
//runProguard true
@@ -22,9 +30,9 @@ android {
}
}
- lintOptions {
- abortOnError false
- }
+ lintOptions {
+ abortOnError false
+ }
sourceSets {
main {