From 62e36ee804262be866946ca467f7abeb2746add4 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 25 Feb 2018 13:00:13 +0100
Subject: #8808 add a link to android's vpn settings for API >= 24

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

(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 71b6d437..03fd4584 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,4 +110,5 @@
   <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
+  <string name="always_on_vpn">Always-on VPN</string>
 </resources>
-- 
cgit v1.2.3


From 30244cbf5b7eaf6152bcdc2cb5b6848f6e10798d Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 25 Feb 2018 23:04:10 +0100
Subject: #8808 add dialog for always-on vpn infos

---
 .../main/res/layout/checkbox_confirm_dialog.xml    | 25 ++++++++++++++++++++++
 app/src/main/res/values/strings.xml                |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 app/src/main/res/layout/checkbox_confirm_dialog.xml

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

diff --git a/app/src/main/res/layout/checkbox_confirm_dialog.xml b/app/src/main/res/layout/checkbox_confirm_dialog.xml
new file mode 100644
index 00000000..d8d4a19e
--- /dev/null
+++ b/app/src/main/res/layout/checkbox_confirm_dialog.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/user_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/activity_horizontal_margin"
+        android:layout_margin="4dp"
+        tools:text="To enable always-on VPN please click on the settings icon [img src=settings/] and turn the switch on. \nFurther information: https://help.bitmask.net/android"
+        />
+
+
+    <CheckBox
+        android:id="@+id/do_not_show_again"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/stdpadding"
+        android:text="@string/do_not_show_again" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03fd4584..4d19758c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,4 +111,6 @@
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
   <string name="always_on_vpn">Always-on VPN</string>
+  <string name="do_not_show_again">Do not show again.</string>
+  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon and turn the switch on."</string>
 </resources>
-- 
cgit v1.2.3


From b14e4b9a7940adb4580c0f3c7a0edcb339c73ae8 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 2 Mar 2018 23:09:08 +0100
Subject: #8808 adds an optional dialog that shows instruction hints for
 always-on vpn

---
 app/src/main/res/drawable-hdpi/ic_settings.png      | Bin 0 -> 826 bytes
 app/src/main/res/drawable-ldpi/ic_settings.png      | Bin 0 -> 534 bytes
 app/src/main/res/drawable-mdpi/ic_settings.png      | Bin 0 -> 657 bytes
 app/src/main/res/drawable-xhdpi/ic_settings.png     | Bin 0 -> 1009 bytes
 app/src/main/res/layout/checkbox_confirm_dialog.xml |   9 ++++-----
 app/src/main/res/values/strings.xml                 |   2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_settings.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_settings.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_settings.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_settings.png

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

diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
new file mode 100644
index 00000000..d3322976
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_settings.png b/app/src/main/res/drawable-ldpi/ic_settings.png
new file mode 100644
index 00000000..2fe03464
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
new file mode 100644
index 00000000..b5988be9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
new file mode 100644
index 00000000..d5959bd9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings.png differ
diff --git a/app/src/main/res/layout/checkbox_confirm_dialog.xml b/app/src/main/res/layout/checkbox_confirm_dialog.xml
index d8d4a19e..6dd22417 100644
--- a/app/src/main/res/layout/checkbox_confirm_dialog.xml
+++ b/app/src/main/res/layout/checkbox_confirm_dialog.xml
@@ -2,16 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-    <TextView
+    <se.leap.bitmaskclient.views.IconTextView
         android:id="@+id/user_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/activity_horizontal_margin"
-        android:layout_margin="4dp"
-        tools:text="To enable always-on VPN please click on the settings icon [img src=settings/] and turn the switch on. \nFurther information: https://help.bitmask.net/android"
+        android:layout_margin="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="0dp"
+        android:autoLink="web"
         />
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d19758c..a308b5e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,5 +112,5 @@
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
   <string name="always_on_vpn">Always-on VPN</string>
   <string name="do_not_show_again">Do not show again.</string>
-  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon and turn the switch on."</string>
+  <string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on."</string>
 </resources>
-- 
cgit v1.2.3