From 4ddeb3ceb09a45353435f897c720ea35d15d3087 Mon Sep 17 00:00:00 2001
From: deeppandya <deeppandya91@gmail.com>
Date: Fri, 10 Nov 2023 00:19:08 -0500
Subject: [PATCH] Remove vpn flag for nightly channel

Enable vpn for nightly channel
---
 .../settings/developer/BraveQAPreferences.java        |  8 --------
 .../chrome/browser/vpn/utils/BraveVpnPrefUtils.java   | 11 -----------
 .../chrome/browser/vpn/utils/BraveVpnUtils.java       | 11 +----------
 android/java/res/xml/qa_preferences.xml               |  6 ------
 4 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
index be21e2251b5..a03a6ef4e9e 100644
--- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
@@ -71,7 +71,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
     private static final int MAX_ADS = 10;
     private static final int DEFAULT_ADS_PER_HOUR = 2;
 
-    private ChromeSwitchPreference mBraveVpnFeature;
     private ChromeSwitchPreference mVpnLinkSubscriptionOnDev;
     private ChromeSwitchPreference mBraveDormantFeatureEngagement;
     private ChromeSwitchPreference mIsStagingServer;
@@ -92,12 +91,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
         super.onCreate(savedInstanceState);
         SettingsUtils.addPreferencesFromResource(this, R.xml.qa_preferences);
 
-        mBraveVpnFeature =
-                (ChromeSwitchPreference) findPreference(BraveVpnPrefUtils.PREF_BRAVE_VPN_FEATURE);
-        if (mBraveVpnFeature != null) {
-            mBraveVpnFeature.setOnPreferenceChangeListener(this);
-        }
-
         mVpnLinkSubscriptionOnDev = (ChromeSwitchPreference) findPreference(
                 BraveVpnPrefUtils.PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_STAGING);
         if (mVpnLinkSubscriptionOnDev != null) {
@@ -261,7 +254,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
         } else if (PREF_QA_DEBUG_NTP.equals(preference.getKey())
                 || PREF_USE_SYNC_STAGING_SERVER.equals(preference.getKey())
                 || PREF_QA_VLOG_REWARDS.equals(preference.getKey())
-                || BraveVpnPrefUtils.PREF_BRAVE_VPN_FEATURE.equals(preference.getKey())
                 || BraveVpnPrefUtils.PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_STAGING.equals(
                         preference.getKey())
                 || OnboardingPrefManager.PREF_DORMANT_USERS_ENGAGEMENT.equals(
diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
index 1f1080d5f9c..bcf2d2b2e83 100644
--- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
+++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
@@ -36,7 +36,6 @@ public class BraveVpnPrefUtils {
     private static final String PREF_EXCLUDED_PACKAGES = "excluded_packages";
 
     public static final String PREF_BRAVE_VPN_AUTOMATIC = "automatic";
-    public static final String PREF_BRAVE_VPN_FEATURE = "brave_vpn_feature";
     public static final String PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_STAGING =
             "brave_vpn_link_subscription_on_staging";
     public static final String PREF_BRAVE_VPN_START = "brave_vpn_start";
@@ -55,16 +54,6 @@ public class BraveVpnPrefUtils {
     private static final SharedPreferences mSharedPreferences =
             ContextUtils.getAppSharedPreferences();
 
-    public static boolean isBraveVpnFeatureEnabled() {
-        return mSharedPreferences.getBoolean(PREF_BRAVE_VPN_FEATURE, false);
-    }
-
-    public static void setBraveVpnFeatureEnabled(boolean newValue) {
-        SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
-        sharedPreferencesEditor.putBoolean(PREF_BRAVE_VPN_FEATURE, newValue);
-        sharedPreferencesEditor.apply();
-    }
-
     public static boolean isLinkSubscriptionOnStaging() {
         return mSharedPreferences.getBoolean(PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_STAGING, false);
     }
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 2ceddb98e8f..03798ee0a59 100644
--- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
+++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
@@ -278,17 +278,8 @@ public class BraveVpnUtils {
         return (braveRewardsNativeWorker != null && braveRewardsNativeWorker.IsSupported());
     }
 
-    private static boolean isBraveVpnFeatureEnable() {
-        if ((ContextUtils.getApplicationContext().getPackageName().equals(
-                     BraveConstants.BRAVE_PRODUCTION_PACKAGE_NAME)
-                    || BraveVpnPrefUtils.isBraveVpnFeatureEnabled())) {
-            return true;
-        }
-        return false;
-    }
-
     public static boolean isVpnFeatureSupported(Context context) {
-        return isBraveVpnFeatureEnable() && isRegionSupported()
+        return isRegionSupported()
                 && ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(context);
     }
 }
diff --git a/android/java/res/xml/qa_preferences.xml b/android/java/res/xml/qa_preferences.xml
index 3138e87e047..b84e9ec7386 100644
--- a/android/java/res/xml/qa_preferences.xml
+++ b/android/java/res/xml/qa_preferences.xml
@@ -7,12 +7,6 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:orderingFromXml="true">
 
-    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
-        android:key="brave_vpn_feature"
-        android:title="@string/brave_vpn"
-        android:summaryOn="@string/text_on"
-        android:summaryOff="@string/text_off" />
-
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="brave_vpn_link_subscription_on_staging"
         android:title="Link VPN subscription on Staging"