diff --git a/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java b/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java
index 4f212fd5f3d..d3058deda47 100644
--- a/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java
+++ b/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java
@@ -26,17 +26,6 @@ import org.chromium.chrome.browser.vpn.adapters.AlwaysOnPagerAdapter;
import org.chromium.chrome.browser.vpn.utils.BraveVpnUtils;
public class VpnAlwaysOnActivity extends AsyncInitializationActivity {
-
- private boolean mIsKillSwitch;
-
- @Override
- protected void onPreCreate() {
- Intent intent = getIntent();
- if (intent != null) {
- mIsKillSwitch = intent.getBooleanExtra(BraveVpnUtils.IS_KILL_SWITCH, false);
- }
- }
-
private void initializeViews() {
setContentView(R.layout.activity_vpn_always_on);
@@ -47,11 +36,11 @@ public class VpnAlwaysOnActivity extends AsyncInitializationActivity {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setTitle(
getResources()
- .getString(mIsKillSwitch ? R.string.kill_switch : R.string.always_on_vpn));
+ .getString(R.string.always_on_vpn));
ViewPager killSwitchTutorialViewPager = findViewById(R.id.kill_switch_tutorial_view_pager);
- AlwaysOnPagerAdapter alwaysOnPagerAdapter = new AlwaysOnPagerAdapter(this, mIsKillSwitch);
+ AlwaysOnPagerAdapter alwaysOnPagerAdapter = new AlwaysOnPagerAdapter(this);
killSwitchTutorialViewPager.setAdapter(alwaysOnPagerAdapter);
TabLayout killSwitchTutorialTabLayout = findViewById(R.id.kill_switch_tutorial_tab_layout);
killSwitchTutorialTabLayout.setupWithViewPager(killSwitchTutorialViewPager, true);
@@ -61,11 +50,6 @@ public class VpnAlwaysOnActivity extends AsyncInitializationActivity {
v -> {
BraveVpnUtils.openVpnSettings(VpnAlwaysOnActivity.this);
});
-
- TextView killSwitchDescText = findViewById(R.id.kill_switch_desc_text);
- if (mIsKillSwitch) {
- killSwitchDescText.setVisibility(View.VISIBLE);
- }
}
@Override
diff --git a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java
index f0b107f5ffb..6f54e01e254 100644
--- a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java
+++ b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java
@@ -37,11 +37,9 @@ public class AlwaysOnPagerAdapter extends PagerAdapter {
R.string.kill_switch_tutorial_text_1,
R.string.kill_switch_tutorial_text_2,
R.string.kill_switch_tutorial_text_3);
- private boolean mIsKillSwitch;
- public AlwaysOnPagerAdapter(Context context, boolean isKillSwitch) {
+ public AlwaysOnPagerAdapter(Context context) {
this.mContext = context;
- this.mIsKillSwitch = isKillSwitch;
}
@NonNull
@@ -62,26 +60,6 @@ public class AlwaysOnPagerAdapter extends PagerAdapter {
"",
null,
new StyleSpan(android.graphics.Typeface.BOLD)));
- if (mIsKillSwitch) {
- killSwitchText =
- killSwitchText
- + "\n"
- + mContext.getResources()
- .getString(R.string.kill_switch_tutorial_text_4);
- tutorialSpannableString =
- SpanApplier.applySpans(
- killSwitchText,
- new SpanInfo(
- "",
- "",
- null,
- new StyleSpan(android.graphics.Typeface.BOLD)),
- new SpanInfo(
- "",
- "",
- null,
- new StyleSpan(android.graphics.Typeface.BOLD)));
- }
killSwitchTutorialText.setText(tutorialSpannableString);
} else {
killSwitchTutorialText.setText(killSwitchText);
@@ -89,7 +67,7 @@ public class AlwaysOnPagerAdapter extends PagerAdapter {
ImageView killSwitchTutorialImage = view.findViewById(R.id.kill_switch_tutorial_image);
int killSwitchImage = mImageResources.get(position);
- if (!mIsKillSwitch && position == 2) {
+ if (position == 2) {
killSwitchImage = R.drawable.ic_vpn_always_on_4;
}
killSwitchTutorialImage.setImageResource(killSwitchImage);
diff --git a/android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java b/android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java
index 89dffa75688..6f5092cab17 100644
--- a/android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java
+++ b/android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java
@@ -71,7 +71,6 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
public static final String PREF_SERVER_RESET_CONFIGURATION = "server_reset_configuration";
private static final String PREF_SPLIT_TUNNELING = "split_tunneling";
private static final String PREF_ALWAYS_ON = "always_on";
- private static final String PREF_KILL_SWITCH = "kill_switch";
private static final String PREF_BRAVE_VPN_SUBSCRIPTION_SECTION =
"brave_vpn_subscription_section";
@@ -193,16 +192,7 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
- BraveVpnUtils.openAlwaysOnActivity(getActivity(), false);
- return true;
- }
- });
- findPreference(PREF_KILL_SWITCH)
- .setOnPreferenceClickListener(
- new Preference.OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- BraveVpnUtils.openAlwaysOnActivity(getActivity(), true);
+ BraveVpnUtils.openAlwaysOnActivity(getActivity());
return true;
}
});
@@ -331,10 +321,6 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
.setEnabled(
BraveVpnPrefUtils
.isSubscriptionPurchase());
- findPreference(PREF_KILL_SWITCH)
- .setEnabled(
- BraveVpnPrefUtils
- .isSubscriptionPurchase());
findPreference(PREF_SUPPORT_TECHNICAL)
.setEnabled(
BraveVpnPrefUtils
diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
index 34d9da6b870..0f5e8682db0 100644
--- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
+++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
@@ -96,12 +96,11 @@ public class BraveVpnUtils {
activity.startActivity(braveVpnSupportIntent);
}
- public static void openAlwaysOnActivity(Activity activity, boolean isKillSwitch) {
+ public static void openAlwaysOnActivity(Activity activity) {
if (activity == null) {
return;
}
Intent vpnAlwaysOnActivityIntent = new Intent(activity, VpnAlwaysOnActivity.class);
- vpnAlwaysOnActivityIntent.putExtra(IS_KILL_SWITCH, isKillSwitch);
activity.startActivity(vpnAlwaysOnActivityIntent);
}
diff --git a/android/java/res/layout/activity_vpn_always_on.xml b/android/java/res/layout/activity_vpn_always_on.xml
index aced1061c59..62c72cb8acd 100644
--- a/android/java/res/layout/activity_vpn_always_on.xml
+++ b/android/java/res/layout/activity_vpn_always_on.xml
@@ -54,16 +54,5 @@
android:textAllCaps="false"
android:text="@string/kill_switch_action_text"
android:textColor="@android:color/white" />
-
-
diff --git a/android/java/res/xml/brave_vpn_preferences.xml b/android/java/res/xml/brave_vpn_preferences.xml
index bf4b68d604e..1d528440803 100644
--- a/android/java/res/xml/brave_vpn_preferences.xml
+++ b/android/java/res/xml/brave_vpn_preferences.xml
@@ -48,10 +48,6 @@
android:key="always_on"
android:title="@string/always_on_vpn"/>
-
-
diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
index 85e71ed92ce..0581982978e 100644
--- a/browser/ui/android/strings/android_brave_strings.grd
+++ b/browser/ui/android/strings/android_brave_strings.grd
@@ -3968,9 +3968,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne
Always-on VPN
-
- Kill switch
-
How to turn on:
@@ -3983,12 +3980,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne
3. Toggle <always_on_tutorial>Always-on VPN</always_on_tutorial> to enable it.
-
- 4. Toggle <always_on_tutorial_2>Block connections without VPN</always_on_tutorial_2> to enable the kill switch.
-
-
- Kill switch will disable split tunneling. It also prevents connections from outside the VPN tunnel.
-
Open Android settings