diff options
| author | cyBerta <cyberta@riseup.net> | 2018-03-23 18:27:11 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-03-23 18:27:11 +0100 |
| commit | 52536097084921db6d8bc145f9e1225900749d83 (patch) | |
| tree | cd3248c6e2f5916b15d4d657b7a29ee86f0362ee /app/src/main | |
| parent | 434c1dd799b11770db148c405845c790b9e2e469 (diff) | |
#8881 fix possible NPE in providerListBaseActivity
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
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); |