Revert "Ammend."

This reverts commit 7c17d2654d9b6f32580e71e22ea08fca1893aa93.

1 files changed, 3 insertions, 4 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 43e0c2aa..ed507de4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -197,9 +197,9 @@ public class EipFragment extends Fragment implements Observer {
         eipCommand(Constants.ACTION_START_EIP);
     }
 
-    public void stop() {
-        Intent intent = new Intent(dashboard.getApplicationContext(), VoidVpnService.class);
-        dashboard.stopService(intent);
+    private void stop() {
+        if(eip_status.isConnecting())
+            VoidVpnService.stop();
         disconnect();
     }
 
@@ -296,7 +296,6 @@ public class EipFragment extends Fragment implements Observer {
                 && !status_message.getText().toString().equalsIgnoreCase(dashboard.getString(R.string.eip_state_not_connected))){
             dashboard.showLog();
         }
-        status_message.setText(dashboard.getString(R.string.eip_state_not_connected));
     }
 
     private void adjustSwitch() {