8827 - fix tests

4 files changed, 25 insertions, 22 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
index 9ed7a178..5a97624d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
@@ -102,14 +102,14 @@ public class ConfigHelper {
         return ret;
     }
 
-    public static X509Certificate parseX509CertificateFromString(String certificate_string) {
+    public static X509Certificate parseX509CertificateFromString(String certificateString) {
         java.security.cert.Certificate certificate = null;
         CertificateFactory cf;
         try {
             cf = CertificateFactory.getInstance("X.509");
 
-            certificate_string = certificate_string.replaceFirst("-----BEGIN CERTIFICATE-----", "").replaceFirst("-----END CERTIFICATE-----", "").trim();
-            byte[] cert_bytes = Base64.decode(certificate_string);
+            certificateString = certificateString.replaceFirst("-----BEGIN CERTIFICATE-----", "").replaceFirst("-----END CERTIFICATE-----", "").trim();
+            byte[] cert_bytes = Base64.decode(certificateString);
             InputStream caInput = new ByteArrayInputStream(cert_bytes);
             try {
                 certificate = cf.generateCertificate(caInput);
@@ -275,7 +275,7 @@ public class ConfigHelper {
     public static Provider getSavedProviderFromSharedPreferences(@NonNull SharedPreferences preferences) {
         Provider provider = new Provider();
         try {
-            provider.setUrl(new URL(preferences.getString(Provider.MAIN_URL, "")));
+            provider.setMainUrl(new URL(preferences.getString(Provider.MAIN_URL, "")));
             provider.define(new JSONObject(preferences.getString(Provider.KEY, "")));
             provider.setCaCert(preferences.getString(Provider.CA_CERT, ""));
         } catch (MalformedURLException | JSONException e) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index e02ce6a9..2f129d02 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -144,7 +144,7 @@ public class Dashboard extends ButterKnifeActivity {
     private Provider getSavedProviderFromSharedPreferences() {
         Provider provider = new Provider();
         try {
-            provider.setUrl(new URL(preferences.getString(Provider.MAIN_URL, "")));
+            provider.setMainUrl(new URL(preferences.getString(Provider.MAIN_URL, "")));
             provider.define(new JSONObject(preferences.getString(Provider.KEY, "")));
             provider.setCaCert(preferences.getString(Provider.CA_CERT, ""));
         } catch (MalformedURLException | JSONException e) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java
index ca28eacd..711d0573 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java
@@ -79,6 +79,14 @@ public final class Provider implements Parcelable {
 
     public Provider() { }
 
+    public Provider(String mainUrl) {
+        try {
+            this.mainUrl.setUrl(new URL(mainUrl));
+        } catch (MalformedURLException e) {
+            this.mainUrl = new DefaultedURL();
+        }
+    }
+
     public Provider(URL mainUrl) {
         this.mainUrl.setUrl(mainUrl);
     }
@@ -118,12 +126,20 @@ public final class Provider implements Parcelable {
                 !caCert.isEmpty();
     }
 
-    protected void setUrl(URL url) {
+    public void setMainUrl(URL url) {
         mainUrl.setUrl(url);
     }
 
-    protected void define(JSONObject provider_json) {
-        definition = provider_json;
+    public void setMainUrl(String url) {
+        try {
+            mainUrl.setUrl(new URL(url));
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void define(JSONObject providerJson) {
+        definition = providerJson;
         parseDefinition(definition);
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
index 7e4acf44..000dd164 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderApiManagerBase.java
@@ -432,19 +432,6 @@ public abstract class ProviderApiManagerBase {
         }
     }
 
-    /**
-     * Sets up an intent with the progress value passed as a parameter
-     * and sends it as a broadcast.
-     *
-     * @param progress
-     */
-    void broadcastProgress(int progress) {
-        Intent intentUpdate = new Intent(UPDATE_PROGRESSBAR);
-        intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
-        intentUpdate.putExtra(CURRENT_PROGRESS, progress);
-        serviceCallback.broadcastEvent(intentUpdate);
-    }
-
     private void broadcastEvent(int resultCode , Bundle resultData) {
         Intent intentUpdate = new Intent(BROADCAST_PROVIDER_API_EVENT);
         intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
@@ -617,7 +604,7 @@ public abstract class ProviderApiManagerBase {
     /**
      * Downloads a provider.json from a given URL, adding a new provider using the given name.
      *
-     * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider, the provider name and its provider.json url.
+     * @param task containing a boolean meaning if the provider is custom or not, another boolean meaning if the user completely trusts this provider
      * @return a bundle with a boolean value mapped to a key named BROADCAST_RESULT_KEY, and which is true if the update was successful.
      */
     protected abstract Bundle setUpProvider(Provider provider, Bundle task);