diff options
| author | cyBerta <cyberta@riseup.net> | 2018-05-12 12:06:01 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-05-12 12:06:01 +0200 |
| commit | 483d89f3599f06c19141c7817ada43ff2a33c461 (patch) | |
| tree | c289d1384eb8af8bcb13e2b7f3569f682a68862f /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | |
| parent | 93d4870267455b30d10c9ce6be76465e88cc50d1 (diff) | |
| parent | 4d744883a032e6f1669ac9527797d8d9cad9f5fe (diff) | |
Merge branch 'cyberta_master' into #8885_testing_ProviderManager
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java')
| -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); |