From 921ee995ef0f0e7f2076ac3538fed289bcb82ba9 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 2 Jan 2020 23:06:36 +0100
Subject: implement basic UI for VPN tethering

---
 .../drawer/NavigationDrawerFragment.java           | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
index 3144d62c..85c982df 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -60,6 +60,7 @@ import se.leap.bitmaskclient.fragments.AboutFragment;
 import se.leap.bitmaskclient.fragments.AlwaysOnDialog;
 import se.leap.bitmaskclient.fragments.ExcludeAppsFragment;
 import se.leap.bitmaskclient.fragments.LogFragment;
+import se.leap.bitmaskclient.fragments.TetheringDialog;
 import se.leap.bitmaskclient.utils.PreferenceHelper;
 import se.leap.bitmaskclient.views.IconSwitchEntry;
 import se.leap.bitmaskclient.views.IconTextEntry;
@@ -236,6 +237,7 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
         initUseBridgesEntry();
         initSaveBatteryEntry();
         initAlwaysOnVpnEntry();
+        initTetheringEntry();
         initExcludeAppsEntry();
         initDonateEntry();
         initLogEntry();
@@ -321,6 +323,19 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
         }
     }
 
+    private void initTetheringEntry() {
+        IconTextEntry tethering = drawerView.findViewById(R.id.tethering);
+        if (PreferenceHelper.hasSuPermission(getContext())) {
+            tethering.setVisibility(VISIBLE);
+            tethering.setOnClickListener((buttonView) -> {
+                showTetheringAlert();
+            });
+        } else {
+            tethering.setVisibility(GONE);
+        }
+
+    }
+
     private void initExcludeAppsEntry() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             IconTextEntry excludeApps = drawerView.findViewById(R.id.exclude_apps);
@@ -442,13 +457,26 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
                         saveBattery(getContext(), true);
                     })
                     .setNegativeButton(activity.getString(android.R.string.no), (dialog, which) -> saveBattery.setCheckedQuietly(false))
-                    .setOnDismissListener(dialog -> showEnableExperimentalFeature = false)
+                    .setOnDismissListener(dialog -> showSaveBattery = false)
                     .setOnCancelListener(dialog -> saveBattery.setCheckedQuietly(false)).show();
         } catch (IllegalStateException e) {
             e.printStackTrace();
         }
     }
 
+    public void showTetheringAlert() {
+        try {
+
+            FragmentTransaction fragmentTransaction = new FragmentManagerEnhanced(
+                    getActivity().getSupportFragmentManager()).removePreviousFragment(
+                    TetheringDialog.TAG);
+            DialogFragment newFragment = new TetheringDialog();
+            newFragment.show(fragmentTransaction, TetheringDialog.TAG);
+        } catch (IllegalStateException | NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void showAlwaysOnDialog() {
         try {
 
-- 
cgit v1.2.3