Merge branch 'hide_experimental_vpn_tethering_on_calyx_os' into 'master'

hide tethering option on CalyxOS 11 (SDK 30)

Closes #9088

See merge request leap/bitmask_android!199

1 files changed, 7 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
index 94f737b4..9d15f839 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/SettingsFragment.java
@@ -11,6 +11,7 @@ import static se.leap.bitmaskclient.base.models.Constants.USE_BRIDGES;
 import static se.leap.bitmaskclient.base.models.Constants.USE_IPv6_FIREWALL;
 import static se.leap.bitmaskclient.base.utils.ConfigHelper.ObfsVpnHelper.useObfsVpn;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.allowExperimentalTransports;
+import static se.leap.bitmaskclient.base.utils.ConfigHelper.isCalyxOSWithTetheringSupport;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getPreferUDP;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getShowAlwaysOnDialog;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getUseBridges;
@@ -213,6 +214,12 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh
 
     private void initTetheringEntry(View rootView) {
         tethering = rootView.findViewById(R.id.tethering);
+
+        if (isCalyxOSWithTetheringSupport(this.getContext())) {
+            tethering.setVisibility(GONE);
+            return;
+        }
+
         tethering.setOnClickListener((buttonView) -> {
             showTetheringAlert();
         });