diff options
| author | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
| commit | 452b42326167b97081bc386dbb8fd800075d1269 (patch) | |
| tree | ca14573e065748fe6a2aad5a096c2d713e0c6e39 /app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java | |
| parent | dc4e74975afcba8a694ec23666c538dc761277b1 (diff) | |
| parent | 117ec679f83e67762552e2c16310a1f57a9b9d88 (diff) | |
Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawer
fix merge conflict in NavigationDrawerFragment
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java index f1f474d7..0e27592b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java @@ -45,6 +45,7 @@ public class ProviderAPI extends IntentService implements ProviderApiManagerBase LOG_IN = "srpAuth", LOG_OUT = "logOut", DOWNLOAD_VPN_CERTIFICATE = "downloadUserAuthedVPNCertificate", + UPDATE_INVALID_VPN_CERTIFICATE = "ProviderAPI.UPDATE_INVALID_VPN_CERTIFICATE", PARAMETERS = "parameters", RECEIVER_KEY = "receiver", ERRORS = "errors", @@ -67,7 +68,9 @@ public class ProviderAPI extends IntentService implements ProviderApiManagerBase PROVIDER_OK = 11, PROVIDER_NOK = 12, CORRECTLY_DOWNLOADED_EIP_SERVICE = 13, - INCORRECTLY_DOWNLOADED_EIP_SERVICE = 14; + INCORRECTLY_DOWNLOADED_EIP_SERVICE = 14, + CORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE = 15, + INCORRECTLY_UPDATED_INVALID_VPN_CERTIFICATE = 16; ProviderApiManager providerApiManager; |