diff options
| author | cyBerta <cyberta@riseup.net> | 2018-01-28 10:17:12 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-01-28 10:17:12 +0100 |
| commit | 298c33b94c8aada449c98a24cdb2c687af40cbbd (patch) | |
| tree | c27c162be2fff26538eba1d6ba4db67ed5c4fd9a /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | |
| parent | 986fe144729b58382641bbf9769a93bf81c06514 (diff) | |
| parent | 3bb2c2c219359a6016366c4d3533a5e2ef812ea9 (diff) | |
Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_design
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java index f60b5cc7..2b0c72db 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java @@ -451,6 +451,12 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity String providerName = ConfigHelper.getProviderName(handledProvider); String providerDomain = ConfigHelper.getProviderDomain(handledProvider); + //FIXME: remove that lines as soon as Provider gets sent via broadcast + if (resultCode == PROVIDER_OK && handledProvider == null) { + providerName = ConfigHelper.getProviderName(preferences); + providerDomain = ConfigHelper.getProviderDomain(preferences); + } + if (providerName != null && providerName.equalsIgnoreCase(provider.getName()) && providerDomain != null && providerDomain.equalsIgnoreCase(provider.getDomain())) { |