diff options
| author | cyberta <cyberta@riseup.net> | 2018-02-06 10:10:47 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-02-06 10:10:47 -0800 |
| commit | a719b004a5159461b320cfbe808837708149f266 (patch) | |
| tree | bc32fb50b59c415097804fd7bbdb296641310cde /app/src/main/java/se/leap/bitmaskclient/Provider.java | |
| parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
| parent | 1a37ac3f86e0bd44842a0fcd86de7c160acfbb04 (diff) | |
Merge branch '8826_custom_provider' into '0.9.8'
8826 custom provider
See merge request leap/bitmask_android!34
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Provider.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Provider.java | 8 |
1 files changed, 8 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 ae329cd1..5ff1949c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Provider.java +++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java @@ -309,4 +309,12 @@ public final class Provider implements Parcelable { this.caCert = cert; } + public boolean isDefault() { + return getMainUrl().isDefault() && + getApiUrl().isDefault() && + certificatePin.isEmpty() && + certificatePinEncoding.isEmpty() && + caCert.isEmpty(); + } + } |