From ee1fe71f67d017af2d1695e438b28dea4a38cb38 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 5 Dec 2017 00:41:07 +0100
Subject: #8742 add some icons that represent the blocking vpn state

---
 app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png  | Bin 0 -> 1427 bytes
 app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png  | Bin 0 -> 514 bytes
 app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png  | Bin 0 -> 514 bytes
 app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png | Bin 0 -> 1427 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png
new file mode 100644
index 00000000..22ea5603
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png
new file mode 100644
index 00000000..bbf8e5fd
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_stat_vpn_blocking.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png
new file mode 100644
index 00000000..bbf8e5fd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_vpn_blocking.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png
new file mode 100644
index 00000000..a6840a41
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_blocking.png differ
-- 
cgit v1.2.3


From ca1cad6ec5b175a85b361c45e8d2c0cac0b405ec Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 7 Dec 2017 12:49:15 +0100
Subject: #8742 basic always-on implementation with blocking vpn if no profile
 is configured

---
 app/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04e83a18..70f6f4ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,5 +76,10 @@
     <string name="signingup_message">is being registered.</string>
     <string name="vpn.button.turn.on">Turn on</string>
     <string name="vpn.button.turn.off">Turn off</string>
+    <string name="vpn_button_turn_off_blocking">Stop blocking</string>
     <string name="bitmask_log">Bitmask Log</string>
+    <string name="void_vpn_establish">Bitmask blocks all outgoing internet traffic.</string>
+    <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string>
+    <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string>
+    <string name="void_vpn_title">Blocking traffic</string>
 </resources>
-- 
cgit v1.2.3