From 8333bd0ad9a6c4f6b07513d29ec8008e11a246dc Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 23 Jan 2018 16:12:59 +0100
Subject: check for correct provider

---
 .../se/leap/bitmaskclient/BaseConfigurationWizard.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
index 0726a785..375ef038 100644
--- a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java
@@ -116,8 +116,6 @@ public abstract class BaseConfigurationWizard extends ConfigWizardBaseActivity
 
     @Override
     protected void onSaveInstanceState(@NotNull Bundle outState) {
-        //if (progressbarDescription != null)
-        //    outState.putString(PROGRESSBAR_TEXT, progressbarDescription.getText().toString());
         outState.putString(ACTIVITY_STATE, mConfigState.getAction());
         outState.putParcelable(Provider.KEY, provider);
 
@@ -447,15 +445,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();
-- 
cgit v1.2.3