summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-06-20 12:26:31 +0200
committerParménides GV <parmegv@sdf.org>2014-06-20 12:26:31 +0200
commitba725770154f4b4cc66e5ba1b8699aef7a006389 (patch)
tree9cf1e1b8197141b745b3d1e4d4dde995b70d5e70 /app/src/main
parent3825bb15d7ff41b8c4266a4f601668e60d54ab29 (diff)
parentb762eed7b3f9117ec682fc6e44125934dddc8d41 (diff)
Merge branch 'bug/get-ca-cert-url-from-provider-dot-json' into develop
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Provider.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index 216f4261..5326709f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -51,6 +51,7 @@ public final class Provider implements Serializable {
SERVICE = "service",
KEY = "provider",
CA_CERT = "ca_cert",
+ CA_CERT_URI = "ca_cert_uri",
NAME = "name",
DESCRIPTION = "description",
DOMAIN = "domain",