diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-01-28 17:45:28 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-28 17:45:28 +0100 |
commit | a1ac4910f062ca8aca06e0468fffef751d3bb714 (patch) | |
tree | 392a31c3627b88107ea30f25488989dcaf7a6c70 /app/src/main/java/se/leap/bitmaskclient/Provider.java | |
parent | 1a25b1dea9ab2d7e76cd79e8928d27f855ca9f2a (diff) | |
parent | 298c33b94c8aada449c98a24cdb2c687af40cbbd (diff) |
Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_provider
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Provider.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Provider.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java index 4d8c741d..5ff1949c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Provider.java +++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java @@ -121,10 +121,18 @@ public final class Provider implements Parcelable { return definition; } + String getDefinitionString() { + return getDefinition().toString(); + } + protected String getDomain() { return mainUrl.getDomain(); } + String getMainUrlString() { + return getMainUrl().toString(); + } + protected DefaultedURL getMainUrl() { return mainUrl; } @@ -301,19 +309,12 @@ public final class Provider implements Parcelable { this.caCert = cert; } - public void storeInPreferences(SharedPreferences preferences) { - preferences.edit().putBoolean(PROVIDER_CONFIGURED, true). - putString(Provider.MAIN_URL, getMainUrl().toString()). - putString(Provider.KEY, getDefinition().toString()).apply(); - } - public boolean isDefault() { return getMainUrl().isDefault() && getApiUrl().isDefault() && certificatePin.isEmpty() && certificatePinEncoding.isEmpty() && caCert.isEmpty(); - } } |