add support for QUIC for tunnel obfuscation

4 files changed, 50 insertions, 17 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java
index 7d12ca70..2e4eec8a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java
@@ -2,11 +2,16 @@ package se.leap.bitmaskclient.base.fragments;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
+import static de.blinkt.openvpn.core.connection.Connection.TransportProtocol.KCP;
+import static de.blinkt.openvpn.core.connection.Connection.TransportProtocol.QUIC;
+import static de.blinkt.openvpn.core.connection.Connection.TransportProtocol.TCP;
 
 import android.app.Dialog;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,10 +19,10 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDialogFragment;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatSpinner;
 
 import se.leap.bitmaskclient.base.utils.BuildConfigHelper;
 import se.leap.bitmaskclient.base.utils.PreferenceHelper;
-import se.leap.bitmaskclient.base.views.IconSwitchEntry;
 import se.leap.bitmaskclient.databinding.DObfuscationProxyBinding;
 import se.leap.bitmaskclient.eip.GatewaysManager;
 
@@ -30,7 +35,9 @@ public class ObfuscationProxyDialog extends AppCompatDialogFragment {
     AppCompatButton saveButton;
     AppCompatButton useDefaultsButton;
     AppCompatButton cancelButton;
-    IconSwitchEntry kcpSwitch;
+    AppCompatSpinner protocolSpinner;
+    private final String[] protocols = { TCP.toString(), KCP.toString(), QUIC.toString() };
+
 
     @NonNull
     @Override
@@ -46,15 +53,29 @@ public class ObfuscationProxyDialog extends AppCompatDialogFragment {
         saveButton = binding.buttonSave;
         useDefaultsButton = binding.buttonDefaults;
         cancelButton = binding.buttonCancel;
-        kcpSwitch = binding.kcpSwitch;
+        protocolSpinner = binding.protocolSpinner;
 
         ipField.setText(PreferenceHelper.getObfuscationPinningIP());
         portField.setText(PreferenceHelper.getObfuscationPinningPort());
         certificateField.setText(PreferenceHelper.getObfuscationPinningCert());
-        kcpSwitch.setChecked(PreferenceHelper.getObfuscationPinningKCP());
 
         GatewaysManager gatewaysManager = new GatewaysManager(getContext());
 
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(binding.getRoot().getContext(), android.R.layout.simple_spinner_item, protocols);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        protocolSpinner.setAdapter(adapter);
+
+        protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                PreferenceHelper.setObfuscationPinningProtocol(protocols[position]);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {}
+        });
+
         saveButton.setOnClickListener(v -> {
             String ip = TextUtils.isEmpty(ipField.getText()) ? null : ipField.getText().toString();
             PreferenceHelper.setObfuscationPinningIP(ip);
@@ -62,7 +83,6 @@ public class ObfuscationProxyDialog extends AppCompatDialogFragment {
             PreferenceHelper.setObfuscationPinningPort(port);
             String cert = TextUtils.isEmpty(certificateField.getText()) ? null : certificateField.getText().toString();
             PreferenceHelper.setObfuscationPinningCert(cert);
-            PreferenceHelper.setObfuscationPinningKCP(kcpSwitch.isChecked());
             PreferenceHelper.setUseObfuscationPinning(ip != null && port != null && cert != null);
             PreferenceHelper.setObfuscationPinningGatewayLocation(gatewaysManager.getLocationNameForIP(ip, v.getContext()));
             dismiss();
@@ -73,7 +93,7 @@ public class ObfuscationProxyDialog extends AppCompatDialogFragment {
            ipField.setText(BuildConfigHelper.obfsvpnIP());
            portField.setText(BuildConfigHelper.obfsvpnPort());
            certificateField.setText(BuildConfigHelper.obfsvpnCert());
-           kcpSwitch.setChecked(BuildConfigHelper.useKcp());
+           protocolSpinner.setSelection(getIndexForProtocol(BuildConfigHelper.obfsvpnTransportProtocol()));
         });
 
         cancelButton.setOnClickListener(v -> {
@@ -85,6 +105,15 @@ public class ObfuscationProxyDialog extends AppCompatDialogFragment {
         return builder.create();
     }
 
+    private int getIndexForProtocol(String protocol) {
+        for (int i = 0; i < protocols.length; i++) {
+            if (protocols[i].equals(protocol)) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
index cc6f3077..b8849c4d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Constants.java
@@ -53,6 +53,7 @@ public interface Constants {
     String OBFUSCATION_PINNING_PORT = "obfuscation_pinning_port";
     String OBFUSCATION_PINNING_CERT = "obfuscation_pinning_cert";
     String OBFUSCATION_PINNING_KCP = "obfuscation_pinning_udp";
+    String OBFUSCATION_PINNING_PROTOCOL = "obfuscation_pinning_protocol";
     String OBFUSCATION_PINNING_LOCATION = "obfuscation_pinning_location";
     String USE_SYSTEM_PROXY = "usesystemproxy";
     String CUSTOM_PROVIDER_DOMAINS = "custom_provider_domains";
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java
index 22af1bfb..22939611 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/BuildConfigHelper.java
@@ -15,7 +15,7 @@ public class BuildConfigHelper {
         String obfsvpnIP();
         String obfsvpnPort();
         String obfsvpnCert();
-        boolean useKcp();
+        String obfsvpnTransportProtocol();
         boolean isDefaultBitmask();
     }
 
@@ -26,9 +26,11 @@ public class BuildConfigHelper {
             return BuildConfig.obfsvpn_ip != null &&
                     BuildConfig.obfsvpn_port != null &&
                     BuildConfig.obfsvpn_cert != null &&
+                    BuildConfig.obfsvpn_transport_protocol != null &&
                     !BuildConfig.obfsvpn_ip.isEmpty() &&
                     !BuildConfig.obfsvpn_port.isEmpty() &&
-                    !BuildConfig.obfsvpn_cert.isEmpty();
+                    !BuildConfig.obfsvpn_cert.isEmpty() &&
+                    !BuildConfig.obfsvpn_transport_protocol.isEmpty();
         }
 
         @Override
@@ -47,8 +49,8 @@ public class BuildConfigHelper {
         }
 
         @Override
-        public boolean useKcp() {
-            return BuildConfig.obfsvpn_use_kcp;
+        public String obfsvpnTransportProtocol() {
+            return BuildConfig.obfsvpn_transport_protocol;
         }
 
         @Override
@@ -79,8 +81,8 @@ public class BuildConfigHelper {
     public static String obfsvpnCert() {
         return instance.obfsvpnCert();
     }
-    public static boolean useKcp() {
-        return instance.useKcp();
+    public static String obfsvpnTransportProtocol() {
+        return instance.obfsvpnTransportProtocol();
     }
 
     public static boolean isDefaultBitmask() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
index d2bb4d1b..ba644b91 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
@@ -1,6 +1,7 @@
 package se.leap.bitmaskclient.base.utils;
 
 import static android.content.Context.MODE_PRIVATE;
+import static de.blinkt.openvpn.core.connection.Connection.TransportProtocol.TCP;
 import static se.leap.bitmaskclient.base.fragments.CensorshipCircumventionFragment.TUNNELING_AUTOMATICALLY;
 import static se.leap.bitmaskclient.base.fragments.CensorshipCircumventionFragment.TUNNELING_OBFS4;
 import static se.leap.bitmaskclient.base.fragments.CensorshipCircumventionFragment.TUNNELING_OBFS4_KCP;
@@ -24,9 +25,9 @@ import static se.leap.bitmaskclient.base.models.Constants.LAST_UPDATE_CHECK;
 import static se.leap.bitmaskclient.base.models.Constants.LAST_USED_PROFILE;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_CERT;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_IP;
-import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_KCP;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_LOCATION;
 import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_PORT;
+import static se.leap.bitmaskclient.base.models.Constants.OBFUSCATION_PINNING_PROTOCOL;
 import static se.leap.bitmaskclient.base.models.Constants.PREFERENCES_APP_VERSION;
 import static se.leap.bitmaskclient.base.models.Constants.PREFERRED_CITY;
 import static se.leap.bitmaskclient.base.models.Constants.PREFER_UDP;
@@ -588,12 +589,12 @@ public class PreferenceHelper {
         return getString(OBFUSCATION_PINNING_LOCATION, null);
     }
 
-    public static Boolean getObfuscationPinningKCP() {
-        return getBoolean(OBFUSCATION_PINNING_KCP, false);
+    public static String getObfuscationPinningProtocol() {
+        return getString(OBFUSCATION_PINNING_PROTOCOL, TCP.toString());
     }
 
-    public static void setObfuscationPinningKCP(boolean isKCP) {
-        putBoolean(OBFUSCATION_PINNING_KCP, isKCP);
+    public static void setObfuscationPinningProtocol(String protocol) {
+        putString(OBFUSCATION_PINNING_PROTOCOL, protocol);
     }
 
     public static void setUseIPv6Firewall(boolean useFirewall) {