Merge branch 'fix_manual_provider_addition' into 'master'

Fix manual provider addition

See merge request leap/bitmask_android!230

1 files changed, 2 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java
index cc6ff149..4b7d22fc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java
@@ -38,7 +38,7 @@ import se.leap.bitmaskclient.providersetup.activities.ProviderListBaseActivity;
  */
 
 public class ProviderApiSetupBroadcastReceiver extends BroadcastReceiver {
-    private WeakReference<ProviderSetupInterface> setupInterfaceRef;
+    private final WeakReference<ProviderSetupInterface> setupInterfaceRef;
 
     public ProviderApiSetupBroadcastReceiver(ProviderSetupInterface setupInterface) {
         this.setupInterfaceRef = new WeakReference<>(setupInterface);
@@ -62,7 +62,7 @@ public class ProviderApiSetupBroadcastReceiver extends BroadcastReceiver {
             Provider handledProvider = resultData.getParcelable(Constants.PROVIDER_KEY);
 
             if (handledProvider != null && setupInterface.getProvider() != null &&
-                    handledProvider.getDomain().equalsIgnoreCase(setupInterface.getProvider().getDomain())) {
+                    handledProvider.getMainUrlString().equalsIgnoreCase(setupInterface.getProvider().getMainUrlString())) {
                 switch (resultCode) {
                     case ProviderAPI.PROVIDER_OK:
                         setupInterface.handleProviderSetUp(handledProvider);