diff options
3 files changed, 10 insertions, 10 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/CensorshipCircumventionFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/CensorshipCircumventionFragment.java index 37f9eb18..3d6bb52c 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/CensorshipCircumventionFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/CensorshipCircumventionFragment.java @@ -29,11 +29,11 @@ import se.leap.bitmaskclient.databinding.FCensorshipCircumventionBinding; import se.leap.bitmaskclient.eip.EipCommand; public class CensorshipCircumventionFragment extends Fragment { - public static int DISCOVERY_NONE = 100200000; + public static int DISCOVERY_AUTOMATICALLY = 100200000; public static int DISCOVERY_SNOWFLAKE = 100200001; public static int DISCOVERY_INVITE_PROXY = 100200002; - public static int TUNNELING_NONE = 100300000; + public static int TUNNELING_AUTOMATICALLY = 100300000; public static int TUNNELING_OBFS4 = 100300001; public static int TUNNELING_OBFS4_KCP = 100300002; @@ -71,7 +71,7 @@ public class CensorshipCircumventionFragment extends Fragment { RadioButton noneRadioButton = new RadioButton(binding.getRoot().getContext()); noneRadioButton.setText(getText(R.string.automatically_select)); - noneRadioButton.setId(DISCOVERY_NONE); + noneRadioButton.setId(DISCOVERY_AUTOMATICALLY); noneRadioButton.setChecked(!(hasSnowflakePrefs() && getUseSnowflake()) && !ProviderObservable.getInstance().getCurrentProvider().hasIntroducer()); binding.discoveryRadioGroup.addView(noneRadioButton); @@ -91,7 +91,7 @@ public class CensorshipCircumventionFragment extends Fragment { binding.discoveryRadioGroup.setOnCheckedChangeListener((group, checkedId) -> { useBridges(true); - if (checkedId == DISCOVERY_NONE) { + if (checkedId == DISCOVERY_AUTOMATICALLY) { useSnowflake(false); } else if (checkedId == DISCOVERY_SNOWFLAKE) { useSnowflake(true); @@ -115,7 +115,7 @@ public class CensorshipCircumventionFragment extends Fragment { RadioButton noneRadioButton = new RadioButton(binding.getRoot().getContext()); noneRadioButton.setText(getText(R.string.automatically_select)); noneRadioButton.setChecked(!getUseObfs4() && !getUseObfs4Kcp()); - noneRadioButton.setId(TUNNELING_NONE); + noneRadioButton.setId(TUNNELING_AUTOMATICALLY); binding.tunnelingRadioGroup.addView(noneRadioButton); if (ProviderObservable.getInstance().getCurrentProvider().supportsObfs4()) { 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 eb777abc..1a14995c 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 @@ -3,7 +3,7 @@ package se.leap.bitmaskclient.base.fragments; import static android.view.View.GONE; import static android.view.View.VISIBLE; import static se.leap.bitmaskclient.R.string.advanced_settings; -import static se.leap.bitmaskclient.base.fragments.CensorshipCircumventionFragment.TUNNELING_NONE; +import static se.leap.bitmaskclient.base.fragments.CensorshipCircumventionFragment.TUNNELING_AUTOMATICALLY; import static se.leap.bitmaskclient.base.models.Constants.GATEWAY_PINNING; import static se.leap.bitmaskclient.base.models.Constants.PREFER_UDP; import static se.leap.bitmaskclient.base.models.Constants.USE_BRIDGES; @@ -105,7 +105,7 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh if (isChecked) { useSnowflake(false); - setUseTunnel(TUNNELING_NONE); + setUseTunnel(TUNNELING_AUTOMATICALLY); setUsePortHopping(false); } useBridges(isChecked); @@ -153,7 +153,7 @@ public class SettingsFragment extends Fragment implements SharedPreferences.OnSh private void resetManualConfig() { useSnowflake(false); - setUseTunnel(TUNNELING_NONE); + setUseTunnel(TUNNELING_AUTOMATICALLY); setUsePortHopping(false); useBridges(false); if (VpnStatus.isVPNActive()) { 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 25a9a3fb..a698630c 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,7 +1,7 @@ package se.leap.bitmaskclient.base.utils; import static android.content.Context.MODE_PRIVATE; -import static se.leap.bitmaskclient.base.fragments.CensorshipCircumventionFragment.TUNNELING_NONE; +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; import static se.leap.bitmaskclient.base.models.Constants.ALLOW_EXPERIMENTAL_TRANSPORTS; @@ -632,7 +632,7 @@ public class PreferenceHelper { } public static int getUseTunnel() { - return getInt(USE_TUNNEL, TUNNELING_NONE); + return getInt(USE_TUNNEL, TUNNELING_AUTOMATICALLY); } public static boolean useIpv6Firewall() { |