Merge branch '8819_config_wizard_design' into 8826_custom_provider

1 files changed, 9 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
index cb52eb48..b5040cdc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
@@ -432,15 +432,21 @@ public abstract class BaseConfigurationWizard extends ConfigWizardBaseActivity
                 int resultCode = intent.getIntExtra(RESULT_CODE, -1);
                 Log.d(TAG, "Broadcast resultCode: " + Integer.toString(resultCode));
 
+                Bundle resultData = intent.getParcelableExtra(RESULT_KEY);
+                String handledProvider = resultData.getString(Provider.KEY);
 
-                if (getProviderName().equalsIgnoreCase(provider.getName()) &&
-                        getProviderDomain().equalsIgnoreCase(provider.getDomain())) {
+                String providerName = getProviderName(handledProvider);
+                String providerDomain = getProviderDomain(handledProvider);
+
+                if (providerName != null && providerName.equalsIgnoreCase(provider.getName()) &&
+                        providerDomain != null &&
+                        providerDomain.equalsIgnoreCase(provider.getDomain())) {
                     switch (resultCode) {
                         case PROVIDER_OK:
                             handleProviderSetUp();
                             break;
                         case PROVIDER_NOK:
-                            handleProviderSetupFailed((Bundle) intent.getParcelableExtra(RESULT_KEY));
+                            handleProviderSetupFailed(resultData);
                             break;
                         case CORRECTLY_DOWNLOADED_CERTIFICATE:
                             handleCorrectlyDownloadedCertificate();