diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-08 19:56:43 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-08 20:04:03 +0200 |
commit | b0a0805ab81aaa4e204ecfc77d3a6a7f7ed66b2f (patch) | |
tree | 7ebeb40d0c74a8c431b7845e403cb1add5e63be4 /app/src/insecure/res | |
parent | 8d39fbdb4980c95268249f21f3c6b8e36b22cf90 (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/src/insecure/res')
-rw-r--r-- | app/src/insecure/res/layout-xlarge/new_provider_dialog.xml | 26 | ||||
-rw-r--r-- | app/src/insecure/res/layout/new_provider_dialog.xml | 24 | ||||
-rw-r--r-- | app/src/insecure/res/values/strings.xml | 4 |
3 files changed, 54 insertions, 0 deletions
diff --git a/app/src/insecure/res/layout-xlarge/new_provider_dialog.xml b/app/src/insecure/res/layout-xlarge/new_provider_dialog.xml new file mode 100644 index 00000000..fc7d84ab --- /dev/null +++ b/app/src/insecure/res/layout-xlarge/new_provider_dialog.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:textSize="24sp" > + + <EditText + android:id="@+id/new_provider_url" + android:inputType="textUri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:textSize="24sp" + android:hint="@string/new_provider_uri" /> + + <CheckBox + android:id="@+id/danger_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="24sp" + android:text="@string/danger_checkbox" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/insecure/res/layout/new_provider_dialog.xml b/app/src/insecure/res/layout/new_provider_dialog.xml new file mode 100644 index 00000000..19b8f442 --- /dev/null +++ b/app/src/insecure/res/layout/new_provider_dialog.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <EditText + android:id="@+id/new_provider_url" + android:inputType="textUri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:hint="@string/new_provider_uri" /> + + <CheckBox + android:id="@+id/danger_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/danger_checkbox" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/insecure/res/values/strings.xml b/app/src/insecure/res/values/strings.xml new file mode 100644 index 00000000..3e568115 --- /dev/null +++ b/app/src/insecure/res/values/strings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="danger_checkbox">Skip security check</string> +</resources> |