Connect if logged in after turning switch on

1 files changed, 2 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index a5cc817a..3b72a486 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -64,10 +64,8 @@ public final class EIP extends IntentService {
 	context = getApplicationContext();
         preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);
 	eip_definition = eipDefinitionFromPreferences();
-        if(gateways_manager.isEmpty()) {
-            gateways_manager = new GatewaysManager(context, preferences);
+        if(gateways_manager.isEmpty())
             gatewaysFromPreferences();
-        }
     }
 
     @Override
@@ -179,6 +177,7 @@ public final class EIP extends IntentService {
 
     private void gatewaysFromPreferences() {
         String gateways_string = preferences.getString(Gateway.TAG, "");
+        gateways_manager = new GatewaysManager(context, preferences);
         gateways_manager.addFromString(gateways_string);
         preferences.edit().remove(Gateway.TAG).apply();
     }