diff options
| author | fupduck <fupduck@riseup.net> | 2018-03-23 10:49:32 -0700 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-03-23 10:49:32 -0700 |
| commit | e9077d5bef0015d5c15a0270e7f15c27e6deebe3 (patch) | |
| tree | c95cb9f4fd75841c0be324b6b8ebdc738580c73f /app/src/main | |
| parent | f01db500f029321d0aa6894ead3f989917219229 (diff) | |
| parent | 52536097084921db6d8bc145f9e1225900749d83 (diff) | |
Merge branch '#8881_fixNPE' into 'master'
#8881 fix possible NPE in providerListBaseActivity
See merge request leap/bitmask_android!72
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); |