diff options
| author | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
|---|---|---|
| committer | lalottacontinua <loddatio@posteo.de> | 2018-06-18 21:15:15 +0200 |
| commit | 1a34cc1e3ebf152505ed591787a7778744020bbd (patch) | |
| tree | 4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | |
| parent | 2fbf5a2cadabb503306af4a59c1f98596784e488 (diff) | |
| parent | 77879cf10f7857b95c968446f5ce9e0437bceb0f (diff) | |
solved merge conflict
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 168fb02e..a31bd9ee 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java @@ -392,7 +392,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); |