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

Add WDP build check (#27398)

Browse Source 
* Add check for WDP native flag in onboarding

* Add check for build flag

* Update BravePrivactSettingsTest number of items
This commit is contained in:
Deep Pandya
2025-01-30 08:37:52 -05:00
committed by GitHub
parent 8bd1604a35
commit de42cabc18
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java
+7 -2
View File
@@ -38,6 +38,7 @@ import org.chromium.base.BravePreferenceKeys;
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveConfig;
import org.chromium.chrome.browser.BraveLocalState;
import org.chromium.chrome.browser.back_press.SecondaryActivityBackPressUma.SecondaryActivity;
import org.chromium.chrome.browser.customtabs.CustomTabActivity;
@@ -228,7 +229,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase {
view -> {
if (mCurrentStep == 0 && !isDefaultBrowser()) {
setDefaultBrowserAndProceedToNextStep();
} else if (mCurrentStep == getWDPPageStep()) {
} else if (isWDPEnabled() && mCurrentStep == getWDPPageStep()) {
UserPrefs.get(getProfileProviderSupplier().get().getOriginalProfile())
.setBoolean(BravePref.WEB_DISCOVERY_ENABLED, true);
nextOnboardingStep();
@@ -285,7 +286,7 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase {
} else if (mCurrentStep == getAnalyticsConsentPageStep()) {
mIvBrave.setVisibility(View.VISIBLE);
showAnalyticsConsentPage();
} else if (mCurrentStep == getWDPPageStep()) {
} else if (isWDPEnabled() && mCurrentStep == getWDPPageStep()) {
showWDPPage();
} else {
OnboardingPrefManager.getInstance().setP3aOnboardingShown(true);
@@ -302,6 +303,10 @@ public class WelcomeOnboardingActivity extends FirstRunActivityBase {
}
}
private boolean isWDPEnabled() {
return BraveConfig.WEB_DISCOVERY_ENABLED;
}
private int getAnalyticsConsentPageStep() {
return 1;
}
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
+1 -2
View File
@@ -379,8 +379,7 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
mSendP3A = (ChromeSwitchPreference) findPreference(PREF_SEND_P3A);
mSendP3A.setOnPreferenceChangeListener(this);
if (BraveConfig.WEB_DISCOVERY_ENABLED
&& ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_WEB_DISCOVERY_NATIVE)) {
if (BraveConfig.WEB_DISCOVERY_ENABLED) {
mSendWebDiscovery = (ChromeSwitchPreference) findPreference(PREF_SEND_WEB_DISCOVERY);
mSendWebDiscovery.setOnPreferenceChangeListener(this);
} else {
android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class BravePrivacySettingsTest {
private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key";
private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
private static final int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 30;
private static final int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 31;
private int mItemsLeft;