From b059fa9e82acc98e9e4783ffbe6b34cdc8a18915 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 31 Oct 2019 09:26:55 +0100
Subject: show blocking state on EipFragment

---
 app/src/main/java/se/leap/bitmaskclient/EipFragment.java | 10 +++++++++-
 app/src/main/res/drawable/vpn_blocking.xml               | 12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/vpn_blocking.xml

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 6c8254d6..0485e907 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -147,7 +147,7 @@ public class EipFragment extends Fragment implements Observer {
 
 
 
-        @Override
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         openVpnConnection = new EipFragmentServiceConnection();
@@ -407,6 +407,14 @@ public class EipFragment extends Fragment implements Observer {
         } else if (eipStatus.isDisconnecting()) {
             setMainButtonEnabled(false);
             showDisconnectingLayout(activity);
+        } else if (eipStatus.isBlocking()) {
+            setMainButtonEnabled(true);
+            vpnStateImage.setStateIcon(R.drawable.vpn_blocking);
+            vpnStateImage.stopProgress(false);
+            routedText.setText(getString(R.string.void_vpn_establish, getString(R.string.app_name)));
+            routedText.setVisibility(VISIBLE);
+            vpnRoute.setVisibility(GONE);
+            colorBackgroundALittle();
         } else {
             mainButton.setText(activity.getString(R.string.vpn_button_turn_on));
             setMainButtonEnabled(true);
diff --git a/app/src/main/res/drawable/vpn_blocking.xml b/app/src/main/res/drawable/vpn_blocking.xml
new file mode 100644
index 00000000..401668fb
--- /dev/null
+++ b/app/src/main/res/drawable/vpn_blocking.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M12.187,18.3125C5.4648,18.3125 0,23.7603 0,30.5c0,6.7397 5.4648,12.2188 12.187,12.2188 5.3051,0 9.8034,-3.4088 11.4701,-8.1563l8.5091,-0.0938 1.7455,-2.0938 1.1532,-0.0313 1.8282,2.1828 1.234,-0.0313 2.0494,-2.3078 1.1221,0 1.7143,2.2188 2.8364,0L48,30.4375l-2.774,-4.0938 -21.6,0C21.9284,21.654 17.451,18.3125 12.187,18.3125ZM7.3558,27.2188c1.8371,0 3.3351,1.5019 3.3351,3.3438 0,1.8418 -1.498,3.3125 -3.3351,3.3125 -1.8371,0 -3.3351,-1.4707 -3.3351,-3.3125 0,-1.8418 1.498,-3.3438 3.3351,-3.3438z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M33.1261,2.9096A10.9661,10.7627 0,0 1,44.0922 13.6723,10.9661 10.7627,0 0,1 33.1261,24.435 10.9661,10.7627 0,0 1,22.16 13.6723,10.9661 10.7627,0 0,1 33.1261,2.9096m0,2.1525a8.7729,8.6102 0,0 0,-8.7729 8.6102c0,1.9911 0.6909,3.8208 1.8423,5.2845L38.5105,6.8703C37.0191,5.7402 35.1548,5.0621 33.1261,5.0621m0,17.2203a8.7729,8.6102 0,0 0,8.7729 -8.6102c0,-1.9911 -0.6909,-3.8208 -1.8423,-5.2845L27.7417,20.4743c1.4914,1.1301 3.3556,1.8081 5.3844,1.8081z"
+      android:fillColor="#ffffff"/>
+</vector>
-- 
cgit v1.2.3