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

Remove usage of BravePrefServiceBridge for boolean BravePrivacySettings

Browse Source
This commit is contained in:
wchen342
2022-12-13 21:17:18 +02:00
parent 10495228fa
commit bfe7ffc519
5 changed files with 45 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
-51
View File
@@ -35,13 +35,6 @@ public class BravePrefServiceBridge {
BravePrefServiceBridgeJni.get().setHTTPSEEnabled(enabled);
}
/**
* @param whether De-AMP should be enabled.
*/
public void setDeAmpEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setDeAmpEnabled(enabled);
}
/**
* @param whether the IPFS gateway should be enabled.
*/
@@ -49,34 +42,6 @@ public class BravePrefServiceBridge {
BravePrefServiceBridgeJni.get().setIpfsGatewayEnabled(enabled);
}
/**
* @param whether google login is enabled on third party sites.
*/
public void setThirdPartyGoogleLoginEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setThirdPartyGoogleLoginEnabled(enabled);
}
/**
* @param whether facebook embeds are allowed on third party sites.
*/
public void setThirdPartyFacebookEmbedEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setThirdPartyFacebookEmbedEnabled(enabled);
}
/**
* @param whether twitter embeds are allowed on third party sites.
*/
public void setThirdPartyTwitterEmbedEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setThirdPartyTwitterEmbedEnabled(enabled);
}
/**
* @param whether linkedin embeds are allowed on third party sites.
*/
public void setThirdPartyLinkedinEmbedEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setThirdPartyLinkedinEmbedEnabled(enabled);
}
/**
* @param whether AdBlock should be enabled.
*/
@@ -171,18 +136,10 @@ public class BravePrefServiceBridge {
BravePrefServiceBridgeJni.get().setSafetynetStatus(status);
}
public void setUseRewardsStagingServer(boolean enabled) {
BravePrefServiceBridgeJni.get().setUseRewardsStagingServer(enabled);
}
public void resetPromotionLastFetchStamp() {
BravePrefServiceBridgeJni.get().resetPromotionLastFetchStamp();
}
public boolean getUseRewardsStagingServer() {
return BravePrefServiceBridgeJni.get().getUseRewardsStagingServer();
}
public void setOldTrackersBlockedCount(Profile profile, long count) {
BravePrefServiceBridgeJni.get().setOldTrackersBlockedCount(profile, count);
}
@@ -302,15 +259,9 @@ public class BravePrefServiceBridge {
String getNoScriptControlType();
void setHTTPSEEnabled(boolean enabled);
void setDeAmpEnabled(boolean enabled);
void setIpfsGatewayEnabled(boolean enabled);
void setAdBlockEnabled(boolean enabled);
void setThirdPartyGoogleLoginEnabled(boolean enabled);
void setThirdPartyFacebookEmbedEnabled(boolean enabled);
void setThirdPartyTwitterEmbedEnabled(boolean enabled);
void setThirdPartyLinkedinEmbedEnabled(boolean enabled);
void setPlayYTVideoInBrowserEnabled(boolean enabled);
boolean getPlayYTVideoInBrowserEnabled();
@@ -335,9 +286,7 @@ public class BravePrefServiceBridge {
void setSafetynetStatus(String status);
void setUseRewardsStagingServer(boolean enabled);
void resetPromotionLastFetchStamp();
boolean getUseRewardsStagingServer();
boolean getBooleanForContentSetting(int content_type);
void setReferralAndroidFirstRunTimestamp(long time);
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
+37 -9
View File
@@ -361,7 +361,8 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
.setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, newValueBool);
}
} else if (PREF_DE_AMP.equals(key)) {
BravePrefServiceBridge.getInstance().setDeAmpEnabled((boolean) newValue);
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.DE_AMP_PREF_ENABLED, (boolean) newValue);
} else if (PREF_DEBOUNCE.equals(key)) {
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.DEBOUNCE_ENABLED, (boolean) newValue);
@@ -443,17 +444,17 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.TOP_SITE_SUGGESTIONS_ENABLED, (boolean) newValue);
} else if (PREF_SOCIAL_BLOCKING_GOOGLE.equals(key)) {
BravePrefServiceBridge.getInstance().setThirdPartyGoogleLoginEnabled(
(boolean) newValue);
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.GOOGLE_LOGIN_CONTROL_TYPE, (boolean) newValue);
} else if (PREF_SOCIAL_BLOCKING_FACEBOOK.equals(key)) {
BravePrefServiceBridge.getInstance().setThirdPartyFacebookEmbedEnabled(
(boolean) newValue);
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.FB_EMBED_CONTROL_TYPE, (boolean) newValue);
} else if (PREF_SOCIAL_BLOCKING_TWITTER.equals(key)) {
BravePrefServiceBridge.getInstance().setThirdPartyTwitterEmbedEnabled(
(boolean) newValue);
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.TWITTER_EMBED_CONTROL_TYPE, (boolean) newValue);
} else if (PREF_SOCIAL_BLOCKING_LINKEDIN.equals(key)) {
BravePrefServiceBridge.getInstance().setThirdPartyLinkedinEmbedEnabled(
(boolean) newValue);
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.LINKED_IN_EMBED_CONTROL_TYPE, (boolean) newValue);
} else if (PREF_CLEAR_ON_EXIT.equals(key)) {
sharedPreferencesEditor.putBoolean(PREF_CLEAR_ON_EXIT, (boolean) newValue);
@@ -599,6 +600,33 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
mDebouncePref.setChecked(UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.DEBOUNCE_ENABLED));
}
// Social blocking
if (mSocialBlockingGoogle != null) {
mSocialBlockingGoogle.setChecked(
UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.GOOGLE_LOGIN_CONTROL_TYPE));
}
if (mSocialBlockingFacebook != null) {
mSocialBlockingFacebook.setChecked(
UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.FB_EMBED_CONTROL_TYPE));
}
if (mSocialBlockingTwitter != null) {
mSocialBlockingTwitter.setChecked(
UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.TWITTER_EMBED_CONTROL_TYPE));
}
if (mSocialBlockingLinkedin != null) {
mSocialBlockingLinkedin.setChecked(
UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.LINKED_IN_EMBED_CONTROL_TYPE));
}
if (mDeAmpPref != null) {
mDeAmpPref.setChecked(UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.DE_AMP_PREF_ENABLED));
}
}
private void removePreferenceIfPresent(String key) {
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
+7 -1
View File
@@ -36,13 +36,16 @@ import org.chromium.chrome.browser.BraveRewardsHelper;
import org.chromium.chrome.browser.BraveRewardsNativeWorker;
import org.chromium.chrome.browser.BraveRewardsObserver;
import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.rewards.BraveRewardsPanel;
import org.chromium.chrome.browser.settings.BravePreferenceFragment;
import org.chromium.chrome.browser.util.BraveDbUtil;
import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.user_prefs.UserPrefs;
import java.io.File;
import java.io.IOException;
@@ -113,6 +116,8 @@ public class BraveQAPreferences extends BravePreferenceFragment
if (mIsStagingServer != null) {
mIsStagingServer.setOnPreferenceChangeListener(this);
}
mIsStagingServer.setChecked(UserPrefs.get(Profile.getLastUsedRegularProfile())
.getBoolean(BravePref.USE_REWARDS_STAGING_SERVER));
mIsSyncStagingServer =
(ChromeSwitchPreference) findPreference(PREF_USE_SYNC_STAGING_SERVER);
@@ -380,7 +385,8 @@ public class BraveQAPreferences extends BravePreferenceFragment
sharedPreferencesEditor.apply();
BravePrefServiceBridge.getInstance().setSafetynetCheckFailed(false);
BravePrefServiceBridge.getInstance().setUseRewardsStagingServer(mUseRewardsStagingServer);
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(BravePref.USE_REWARDS_STAGING_SERVER, mUseRewardsStagingServer);
BraveRewardsHelper.setRewardsEnvChange(true);
BraveRelaunchUtils.askForRelaunch(getActivity());
browser/android/preferences/BUILD.gn
+1
View File
@@ -39,6 +39,7 @@ java_cpp_strings("java_pref_names_srcjar") {
"//brave/components/brave_shields/common/pref_names.cc",
"//brave/components/brave_vpn/pref_names.cc",
"//brave/components/constants/pref_names.cc",
"//brave/components/de_amp/common/pref_names.cc",
"//brave/components/debounce/common/pref_names.cc",
"//brave/components/ntp_background_images/common/pref_names.cc",
"//brave/components/omnibox/browser/brave_omnibox_prefs.cc",
browser/android/preferences/brave_pref_service_bridge.cc
-44
View File
@@ -93,11 +93,6 @@ void JNI_BravePrefServiceBridge_SetHTTPSEEnabled(JNIEnv* env,
enabled, GURL(), g_browser_process->local_state());
}
void JNI_BravePrefServiceBridge_SetDeAmpEnabled(JNIEnv* env, jboolean enabled) {
GetOriginalProfile()->GetPrefs()->SetBoolean(de_amp::kDeAmpPrefEnabled,
enabled);
}
void JNI_BravePrefServiceBridge_SetIpfsGatewayEnabled(JNIEnv* env,
jboolean enabled) {
#if BUILDFLAG(ENABLE_IPFS)
@@ -109,34 +104,6 @@ void JNI_BravePrefServiceBridge_SetIpfsGatewayEnabled(JNIEnv* env,
#endif
}
void JNI_BravePrefServiceBridge_SetThirdPartyGoogleLoginEnabled(
JNIEnv* env,
jboolean enabled) {
GetOriginalProfile()->GetPrefs()->SetBoolean(kGoogleLoginControlType,
enabled);
}
void JNI_BravePrefServiceBridge_SetThirdPartyFacebookEmbedEnabled(
JNIEnv* env,
jboolean enabled) {
GetOriginalProfile()->GetPrefs()->SetBoolean(
brave_shields::prefs::kFBEmbedControlType, enabled);
}
void JNI_BravePrefServiceBridge_SetThirdPartyTwitterEmbedEnabled(
JNIEnv* env,
jboolean enabled) {
GetOriginalProfile()->GetPrefs()->SetBoolean(
brave_shields::prefs::kTwitterEmbedControlType, enabled);
}
void JNI_BravePrefServiceBridge_SetThirdPartyLinkedinEmbedEnabled(
JNIEnv* env,
jboolean enabled) {
GetOriginalProfile()->GetPrefs()->SetBoolean(
brave_shields::prefs::kLinkedInEmbedControlType, enabled);
}
void JNI_BravePrefServiceBridge_SetAdBlockEnabled(JNIEnv* env,
jboolean enabled) {
brave_shields::SetAdControlType(
@@ -390,22 +357,11 @@ void JNI_BravePrefServiceBridge_SetSafetynetStatus(
kSafetynetStatus, ConvertJavaStringToUTF8(env, status));
}
void JNI_BravePrefServiceBridge_SetUseRewardsStagingServer(JNIEnv* env,
jboolean enabled) {
GetOriginalProfile()->GetPrefs()->SetBoolean(
brave_rewards::prefs::kUseRewardsStagingServer, enabled);
}
void JNI_BravePrefServiceBridge_ResetPromotionLastFetchStamp(JNIEnv* env) {
GetOriginalProfile()->GetPrefs()->SetUint64(
brave_rewards::prefs::kPromotionLastFetchStamp, 0);
}
jboolean JNI_BravePrefServiceBridge_GetUseRewardsStagingServer(JNIEnv* env) {
return GetOriginalProfile()->GetPrefs()->GetBoolean(
brave_rewards::prefs::kUseRewardsStagingServer);
}
jboolean JNI_BravePrefServiceBridge_GetBooleanForContentSetting(JNIEnv* env,
jint type) {
HostContentSettingsMap* content_settings =