Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove vpn flag for nightly channel

Browse Source 
Enable vpn for nightly channel
This commit is contained in:
deeppandya
2023-11-10 00:19:08 -05:00
parent 233fc8b28a
commit 4ddeb3ceb0
4 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
-8
View File
@@ -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(
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
-11
View File
@@ -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);
}
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
+1 -10
View File
@@ -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);
}
}
android/java/res/xml/qa_preferences.xml
-6
View File
@@ -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"