From 52536097084921db6d8bc145f9e1225900749d83 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Mar 2018 18:27:11 +0100
Subject: #8881 fix possible NPE in providerListBaseActivity

---
 app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index e0d6e27d..6a0a1864 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -385,7 +385,8 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
                 Bundle resultData = intent.getParcelableExtra(BROADCAST_RESULT_KEY);
                 Provider handledProvider = resultData.getParcelable(PROVIDER_KEY);
 
-                if (handledProvider != null && handledProvider.getDomain().equalsIgnoreCase(provider.getDomain())) {
+                if (handledProvider != null && provider != null &&
+                        handledProvider.getDomain().equalsIgnoreCase(provider.getDomain())) {
                     switch (resultCode) {
                         case PROVIDER_OK:
                             handleProviderSetUp(handledProvider);
-- 
cgit v1.2.3