8865 - allow disconnect without connection

* revert last commit
* dirty fix to disconnect - see #8876
* add padding in EipFragment

4 files changed, 24 insertions, 28 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index c4f4dbc9..1a6ad8d2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -29,6 +29,7 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.AppCompatImageView;
 import android.support.v7.widget.AppCompatTextView;
@@ -56,6 +57,11 @@ import se.leap.bitmaskclient.views.VpnStateImage;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_NONETWORK;
+import static se.leap.bitmaskclient.Constants.BROADCAST_EIP_EVENT;
+import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE;
+import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY;
+import static se.leap.bitmaskclient.Constants.EIP_ACTION_STOP;
+import static se.leap.bitmaskclient.Constants.EIP_REQUEST;
 import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
 import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.Constants.REQUEST_CODE_LOG_IN;
@@ -256,6 +262,17 @@ public class EipFragment extends Fragment implements Observer {
             askPendingStartCancellation();
         } else if (eipStatus.isConnected()) {
             askToStopEIP();
+        } else if (isOpenVpnRunningWithoutNetwork()) {
+            // TODO move to EIP
+            // TODO see stopEIP function
+            Bundle resultData = new Bundle();
+            resultData.putString(EIP_REQUEST, EIP_ACTION_STOP);
+            Intent intentUpdate = new Intent(BROADCAST_EIP_EVENT);
+            intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
+            intentUpdate.putExtra(BROADCAST_RESULT_CODE, Activity.RESULT_OK);
+            intentUpdate.putExtra(BROADCAST_RESULT_KEY, resultData);
+            Log.d(TAG, "sending broadcast");
+            LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(intentUpdate);
         }
     }
 
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 5cf180d3..665e0ebd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -184,6 +184,7 @@ public final class EIP extends IntentService {
 
     private void stopEIP() {
         // TODO stop eip from here if possible...
+        // TODO then refactor EipFragment.handleSwitchOff
         EipStatus eipStatus = EipStatus.getInstance();
         int resultCode = RESULT_CANCELED;
         if (eipStatus.isConnected() || eipStatus.isConnecting())
diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
index c09bda2d..2fe046b8 100644
--- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml
+++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml
@@ -58,11 +58,7 @@
         android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
+        android:padding="@dimen/stdpadding"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:gravity="center"
@@ -102,11 +98,7 @@
         android:id="@+id/routed_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
+        android:padding="@dimen/stdpadding"
         android:text="@string/vpn_securely_routed"
         android:gravity="center"
         android:visibility="visible"
@@ -118,10 +110,7 @@
         android:id="@+id/vpn_route"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
+        android:padding="@dimen/stdpadding"
         android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 30b94de9..9842198b 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -56,11 +56,7 @@
         android:id="@+id/eipLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
+        android:padding="@dimen/stdpadding"
         android:text="@string/eip_service_label"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:gravity="center"
@@ -102,11 +98,7 @@
         android:id="@+id/routed_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginTop="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
+        android:padding="@dimen/stdpadding"
         android:text="@string/vpn_securely_routed"
         android:gravity="center"
         android:visibility="visible"
@@ -118,10 +110,7 @@
         android:id="@+id/vpn_route"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/stdpadding"
-        android:layout_marginStart="@dimen/stdpadding"
-        android:layout_marginLeft="@dimen/stdpadding"
-        android:layout_marginRight="@dimen/stdpadding"
+        android:padding="@dimen/stdpadding"
         android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"