Merge branch 'implement_tethering_for_rooted_devices' into 'master'

Implement tethering for rooted devices

See merge request leap/bitmask_android!98

38 files changed, 152 insertions, 0 deletions

diff --git a/app/src/main/res/drawable-hdpi/ic_access_point_36.png b/app/src/main/res/drawable-hdpi/ic_access_point_36.png
new file mode 100644
index 00000000..03444d0f
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_access_point_36.png
diff --git a/app/src/main/res/drawable-hdpi/ic_bluetooth.png b/app/src/main/res/drawable-hdpi/ic_bluetooth.png
new file mode 100644
index 00000000..e7c1589b
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_bluetooth.png
diff --git a/app/src/main/res/drawable-hdpi/ic_cancel.png b/app/src/main/res/drawable-hdpi/ic_cancel.png
new file mode 100644
index 00000000..579b1dff
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_cancel.png
diff --git a/app/src/main/res/drawable-hdpi/ic_check_bold.png b/app/src/main/res/drawable-hdpi/ic_check_bold.png
new file mode 100644
index 00000000..28418346
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_check_bold.png
diff --git a/app/src/main/res/drawable-hdpi/ic_usb.png b/app/src/main/res/drawable-hdpi/ic_usb.png
new file mode 100644
index 00000000..b9de586f
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_usb.png
diff --git a/app/src/main/res/drawable-hdpi/ic_wifi.png b/app/src/main/res/drawable-hdpi/ic_wifi.png
new file mode 100644
index 00000000..ca6b94a3
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_wifi.png
diff --git a/app/src/main/res/drawable-ldpi/ic_bluetooth.png b/app/src/main/res/drawable-ldpi/ic_bluetooth.png
new file mode 100644
index 00000000..3a73c82f
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_bluetooth.png
diff --git a/app/src/main/res/drawable-ldpi/ic_cancel.png b/app/src/main/res/drawable-ldpi/ic_cancel.png
new file mode 100644
index 00000000..a396f18e
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_cancel.png
diff --git a/app/src/main/res/drawable-ldpi/ic_check_bold.png b/app/src/main/res/drawable-ldpi/ic_check_bold.png
new file mode 100644
index 00000000..4f765ed4
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_check_bold.png
diff --git a/app/src/main/res/drawable-ldpi/ic_usb.png b/app/src/main/res/drawable-ldpi/ic_usb.png
new file mode 100644
index 00000000..d48d2f50
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_usb.png
diff --git a/app/src/main/res/drawable-ldpi/ic_wifi.png b/app/src/main/res/drawable-ldpi/ic_wifi.png
new file mode 100644
index 00000000..56ad6403
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_wifi.png
diff --git a/app/src/main/res/drawable-mdpi/ic_access_point_36.png b/app/src/main/res/drawable-mdpi/ic_access_point_36.png
new file mode 100644
index 00000000..c461a0a5
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_access_point_36.png
diff --git a/app/src/main/res/drawable-mdpi/ic_bluetooth.png b/app/src/main/res/drawable-mdpi/ic_bluetooth.png
new file mode 100644
index 00000000..a1cecd2b
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_bluetooth.png
diff --git a/app/src/main/res/drawable-mdpi/ic_cancel.png b/app/src/main/res/drawable-mdpi/ic_cancel.png
new file mode 100644
index 00000000..125c82f1
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_cancel.png
diff --git a/app/src/main/res/drawable-mdpi/ic_check_bold.png b/app/src/main/res/drawable-mdpi/ic_check_bold.png
new file mode 100644
index 00000000..872ef957
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_check_bold.png
diff --git a/app/src/main/res/drawable-mdpi/ic_usb.png b/app/src/main/res/drawable-mdpi/ic_usb.png
new file mode 100644
index 00000000..3ad5ebc1
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_usb.png
diff --git a/app/src/main/res/drawable-mdpi/ic_wifi.png b/app/src/main/res/drawable-mdpi/ic_wifi.png
new file mode 100644
index 00000000..21a69023
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_wifi.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_access_point_36.png b/app/src/main/res/drawable-xhdpi/ic_access_point_36.png
new file mode 100644
index 00000000..4ae3d1d9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_access_point_36.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_bluetooth.png b/app/src/main/res/drawable-xhdpi/ic_bluetooth.png
new file mode 100644
index 00000000..32a854e5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_bluetooth.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel.png b/app/src/main/res/drawable-xhdpi/ic_cancel.png
new file mode 100644
index 00000000..aac09d65
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_cancel.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_check_bold.png b/app/src/main/res/drawable-xhdpi/ic_check_bold.png
new file mode 100644
index 00000000..da6a1ecb
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_check_bold.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_usb.png b/app/src/main/res/drawable-xhdpi/ic_usb.png
new file mode 100644
index 00000000..c11940b1
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_usb.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_wifi.png b/app/src/main/res/drawable-xhdpi/ic_wifi.png
new file mode 100644
index 00000000..cf1bb909
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_wifi.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bluetooth.png b/app/src/main/res/drawable-xxhdpi/ic_bluetooth.png
new file mode 100644
index 00000000..9c30e5b4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_bluetooth.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxhdpi/ic_cancel.png
new file mode 100644
index 00000000..1e9bce6c
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_cancel.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_bold.png b/app/src/main/res/drawable-xxhdpi/ic_check_bold.png
new file mode 100644
index 00000000..f6b50706
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_check_bold.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_usb.png b/app/src/main/res/drawable-xxhdpi/ic_usb.png
new file mode 100644
index 00000000..c78e33af
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_usb.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_wifi.png b/app/src/main/res/drawable-xxhdpi/ic_wifi.png
new file mode 100644
index 00000000..ea9e08a9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_wifi.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png b/app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png
new file mode 100644
index 00000000..4a2f25c1
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_access_point_36.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png
new file mode 100644
index 00000000..6eccbbd6
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
new file mode 100644
index 00000000..4ef00efc
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check_bold.png b/app/src/main/res/drawable-xxxhdpi/ic_check_bold.png
new file mode 100644
index 00000000..19029a0d
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_check_bold.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_usb.png b/app/src/main/res/drawable-xxxhdpi/ic_usb.png
new file mode 100644
index 00000000..4bebd840
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_usb.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_wifi.png b/app/src/main/res/drawable-xxxhdpi/ic_wifi.png
new file mode 100644
index 00000000..b5a05f7a
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_wifi.png
diff --git a/app/src/main/res/layout/d_list_selection.xml b/app/src/main/res/layout/d_list_selection.xml
new file mode 100644
index 00000000..ef963303
--- /dev/null
+++ b/app/src/main/res/layout/d_list_selection.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/tvTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/standard_margin"
+            android:layout_marginTop="@dimen/add_button_margin"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:textAllCaps="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textStyle="bold"
+            />
+
+        <android.support.v7.widget.AppCompatTextView
+            android:id="@+id/user_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginBottom="0dp"
+            tools:text="@string/tethering_message"
+            android:textSize="17sp"
+            />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/selection_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawSelectorOnTop="false"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/standard_margin"
+            android:layout_marginBottom="@dimen/standard_margin"
+            android:visibility="visible"
+            tools:visibility="visible"
+            />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index f6c9b2bb..191d547f 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -97,10 +97,47 @@
             android:visibility="gone"
             />
 
+        <TextView
+            android:id="@+id/show_experimental_features"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/show_experimental"
+            android:textColor="@color/colorPrimaryDark"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:gravity="center"
+            android:background="@color/black800_high_transparent"
+            />
+
+        <se.leap.bitmaskclient.views.IconSwitchEntry
+            android:id="@+id/enableIPv6Firewall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:text="@string/ipv6Firewall"
+            app:subtitle="@string/require_root"
+            app:icon="@drawable/ic_cancel"
+            android:visibility="gone"
+            tools:visibility="visible"
+            />
+
+        <se.leap.bitmaskclient.views.IconTextEntry
+            android:id="@+id/tethering"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:text="@string/tethering"
+            app:subtitle="@string/require_root"
+            app:icon="@drawable/ic_access_point_36"
+            android:visibility="gone"
+            tools:visibility="visible"
+            />
+
         <View
+            android:id="@+id/experimental_features_footer"
             android:layout_width="match_parent"
             android:layout_height="20dp"
             android:background="@color/black800_high_transparent"
+            android:visibility="gone"
+            tools:visibility="visible"
             />
 
         <se.leap.bitmaskclient.views.IconTextEntry
diff --git a/app/src/main/res/layout/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml
new file mode 100644
index 00000000..2fa56b46
--- /dev/null
+++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml
@@ -0,0 +1,53 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_container"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/material_icon"
+        android:layout_width="?android:attr/listPreferredItemHeightSmall"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:padding="6dp"
+        android:layout_gravity="center"
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/ic_bluetooth"
+        />
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:gravity="center_vertical"
+        android:paddingStart="4dp"
+        android:paddingLeft="4dp"
+        android:paddingEnd="4dp"
+        android:paddingRight="4dp"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        tools:text="TEST"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
+        />
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/checked_icon"
+        android:layout_width="?android:attr/listPreferredItemHeightSmall"
+        android:layout_height="?android:attr/listPreferredItemHeightSmall"
+        android:layout_gravity="center"
+        android:padding="10dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        tools:src="@drawable/ic_check_bold"
+        android:visibility="visible"
+        tools:visibility="visible"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@android:color/darker_gray"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b52e34dd..b5fc2fa2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -105,6 +105,17 @@
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
   <string name="always_on_vpn">Always-on VPN</string>
   <string name="subtitle_always_on_vpn">Open Android System Settings</string>
+  <string name="tethering">VPN Hotspot</string>
+  <string name="ipv6Firewall">Block IPv6</string>
+  <string name="require_root">Requires root permissions</string>
+  <string name="show_experimental">Show experimental options</string>
+  <string name="hide_experimental">Hide experimental options</string>
+  <string name="tethering_enabled_message">Please make sure to enable tethering in the %s first!</string>
+  <string name="tethering_system_settings">system settings</string>
+  <string name="tethering_message">Share your VPN with other devices via:</string>
+  <string name="tethering_wifi">Wifi hotspot</string>
+  <string name="tethering_usb">USB tethering</string>
+  <string name="tethering_bluetooth">Bluetooth tethering</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 [img src] and turn the switch on.</string>
   <string name="always_on_blocking_vpn_user_message">To protect your privacy optimally, you should also activate the option \"Block connections without VPN\".</string>