diff options
author | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
commit | 452b42326167b97081bc386dbb8fd800075d1269 (patch) | |
tree | ca14573e065748fe6a2aad5a096c2d713e0c6e39 /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | |
parent | dc4e74975afcba8a694ec23666c538dc761277b1 (diff) | |
parent | 117ec679f83e67762552e2c16310a1f57a9b9d88 (diff) |
Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawer
fix merge conflict in NavigationDrawerFragment
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); |