Pinning connection to provider.json

Using AndroidPinning library from Moxie, I make sure the provider.json
file Bitmask downloads is fetched from a pinned https connection, so
that the api certificate fingerprint is the good one.

1 files changed, 12 insertions, 11 deletions

diff --git a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
index 19ba1ba8..68ff9e47 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -126,7 +126,7 @@ public class ConfigurationWizard extends Activity
 
         if (fragment_manager.findFragmentByTag(ProviderDetailFragment.TAG) == null && setting_up_provider) {
             if (selected_provider != null)
-                onItemSelectedUi(selected_provider);
+                onItemSelectedUi();
             if (progress > 0)
                 mProgressBar.setProgress(progress);
         }
@@ -229,17 +229,17 @@ public class ConfigurationWizard extends Activity
     void onItemSelected(int position) {
         //TODO Code 2 pane view
         selected_provider = adapter.getItem(position);
-        onItemSelectedUi(selected_provider);
-        onItemSelectedLogic(selected_provider);
+        onItemSelectedUi();
+        onItemSelectedLogic();
     }
 
-    private void onItemSelectedLogic(Provider selected_provider) {
-        setUpProvider(selected_provider.mainUrl());
+    private void onItemSelectedLogic() {
+        setUpProvider();
     }
 
-    private void onItemSelectedUi(Provider provider) {
+    private void onItemSelectedUi() {
         startProgressBar();
-        adapter.hideAllBut(adapter.indexOf(provider));
+        adapter.hideAllBut(adapter.indexOf(selected_provider));
     }
 
     @Override
@@ -379,8 +379,8 @@ public class ConfigurationWizard extends Activity
 
     private void autoSelectProvider(Provider provider) {
         selected_provider = provider;
-        onItemSelectedUi(selected_provider);
-        onItemSelectedLogic(selected_provider);
+        onItemSelectedUi();
+        onItemSelectedLogic();
     }
 
     /**
@@ -389,10 +389,11 @@ public class ConfigurationWizard extends Activity
      * @param provider_name
      * @param provider_main_url
      */
-    public void setUpProvider(URL provider_main_url) {
+    public void setUpProvider() {
         Intent provider_API_command = new Intent(this, ProviderAPI.class);
         Bundle parameters = new Bundle();
-        parameters.putString(Provider.MAIN_URL, provider_main_url.toString());
+        parameters.putString(Provider.MAIN_URL, selected_provider.mainUrl().toString());
+        parameters.putString(Provider.CA_CERT_FINGERPRINT, selected_provider.certificatePin());
 
         provider_API_command.setAction(ProviderAPI.SET_UP_PROVIDER);
         provider_API_command.putExtra(ProviderAPI.PARAMETERS, parameters);