8827 - merge request discussions

* add deleteProviderDetailsFromPreferences to ConfigHelper
* validate every field in Provider.equals
* add reset() method to Provider

1 files changed, 2 insertions, 18 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 5fe6ed05..1284ca64 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -211,11 +211,8 @@ public abstract class ProviderApiManagerBase {
     }
 
     void resetProviderDetails(Provider provider) {
-        provider.setCaCert("");
-        provider.define(new JSONObject());
-        provider.setEipServiceJson(new JSONObject());
-
-        deleteProviderDetailsFromPreferences(provider.getDomain());
+        provider.reset();
+        ConfigHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain());
     }
 
     String formatErrorMessage(final int toastStringId) {
@@ -772,19 +769,6 @@ public abstract class ProviderApiManagerBase {
         return "";
     }
 
-    protected void deleteProviderDetailsFromPreferences(String providerDomain) {
-
-        if (preferences.contains(Provider.KEY + "." + providerDomain)) {
-            preferences.edit().remove(Provider.KEY + "." + providerDomain).apply();
-        }
-        if (preferences.contains(Provider.CA_CERT + "." + providerDomain)) {
-            preferences.edit().remove(Provider.CA_CERT + "." + providerDomain).apply();
-        }
-        if (preferences.contains(Provider.CA_CERT_FINGERPRINT + "." + providerDomain)) {
-            preferences.edit().remove(Provider.CA_CERT_FINGERPRINT + "." + providerDomain).apply();
-        }
-    }
-
     protected String getPersistedCaCertFingerprint(String providerDomain) {
         try {
             return getPersistedProviderDefinition(providerDomain).getString(Provider.CA_CERT_FINGERPRINT);