implement UI, logic and test for prefer UDP preferences

1 files changed, 17 insertions, 2 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 ed1e8b6d..87c64a89 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
@@ -34,10 +34,12 @@ import static se.leap.bitmaskclient.base.MainActivity.ACTION_SHOW_VPN_FRAGMENT;
 import static se.leap.bitmaskclient.base.models.Constants.SHARED_PREFERENCES;
 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.PreferenceHelper.getPreferUDP;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getShowAlwaysOnDialog;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getUseBridges;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.getUseSnowflake;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.hasSnowflakePrefs;
+import static se.leap.bitmaskclient.base.utils.PreferenceHelper.preferUDP;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useBridges;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.useSnowflake;
 
@@ -63,10 +65,11 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh
         View view = inflater.inflate(R.layout.f_settings, container, false);
         initAlwaysOnVpnEntry(view);
         initExcludeAppsEntry(view);
-        initFirewallEntry(view);
-        initTetheringEntry(view);
+        initPreferUDPEntry(view);
         initUseBridgesEntry(view);
         initUseSnowflakeEntry(view);
+        initFirewallEntry(view);
+        initTetheringEntry(view);
         return view;
     }
 
@@ -126,6 +129,18 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh
         }
     }
 
+    private void initPreferUDPEntry(View rootView) {
+        IconSwitchEntry useSnowflake = rootView.findViewById(R.id.prefer_udp);
+        useSnowflake.setVisibility(VISIBLE);
+        useSnowflake.setChecked(getPreferUDP(getContext()));
+        useSnowflake.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (!buttonView.isPressed()) {
+                return;
+            }
+            preferUDP(getContext(), isChecked);
+        });
+    }
+
     private void initExcludeAppsEntry(View rootView) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             IconTextEntry excludeApps = rootView.findViewById(R.id.exclude_apps);