Remove kill switch changes

2024-06-06 00:37:23 -04:00
parent b150947c25
commit a99f6f33ff
7 changed files with 6 additions and 83 deletions
@@ -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
@@ -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 {
                                    "</always_on_tutorial>",
                                    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(
-                                        "<always_on_tutorial>",
-                                        "</always_on_tutorial>",
-                                        null,
-                                        new StyleSpan(android.graphics.Typeface.BOLD)),
-                                new SpanInfo(
-                                        "<always_on_tutorial_2>",
-                                        "</always_on_tutorial_2>",
-                                        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);
@@ -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
@@ -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);
    }

@@ -54,16 +54,5 @@
            android:textAllCaps="false"
            android:text="@string/kill_switch_action_text" 
            android:textColor="@android:color/white" />
-
-        <TextView
-            android:id="@+id/kill_switch_desc_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            style="@style/DefaultRegular"
-            android:layout_marginHorizontal="16dp"
-            android:textColor="@color/text_secondary"
-            android:text="@string/kill_switch_text"
-            android:gravity="center_horizontal"/>
    </LinearLayout>
 </ScrollView>
@@ -48,10 +48,6 @@
            android:key="always_on"
            android:title="@string/always_on_vpn"/>

-        <org.chromium.components.browser_ui.settings.ChromeBasePreference
-            android:key="kill_switch"
-            android:title="@string/kill_switch"/>
-
        <org.chromium.components.browser_ui.settings.ChromeBasePreference
            android:key="split_tunneling"
            android:title="@string/split_tunneling"/>