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

Remove usage of BravePrefServiceBridge for boolean background video playback (#29197)

Browse Source 
* Remove usage of `BravePrefServiceBridge` for boolean background video playback

* Use mTabModelProfileSupplier as settings UI always use original profile
This commit is contained in:
Simone Arpe
2025-05-28 16:05:26 -07:00
committed by GitHub
parent cc3c1ecd34
commit e2a5b49706
4 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+8 -3
View File
@@ -1476,18 +1476,23 @@ public abstract class BraveActivity extends ChromeActivity
}
private void migrateBgPlaybackToFeature() {
// Settings UI uses original profile always, so we must
// use mTabModelProfileSupplier.get().getOriginalProfile().
if (ChromeSharedPreferences.getInstance()
.readBoolean(
BravePreferenceKeys.BRAVE_BACKGROUND_VIDEO_PLAYBACK_CONVERTED_TO_FEATURE,
false)) {
if (BravePrefServiceBridge.getInstance().getBackgroundVideoPlaybackEnabled()
if (UserPrefs.get(mTabModelProfileSupplier.get().getOriginalProfile())
.getBoolean(BravePref.BACKGROUND_VIDEO_PLAYBACK_ENABLED)
&& ChromeFeatureList.isEnabled(
BraveFeatureList.BRAVE_BACKGROUND_VIDEO_PLAYBACK)) {
BravePrefServiceBridge.getInstance().setBackgroundVideoPlaybackEnabled(false);
UserPrefs.get(mTabModelProfileSupplier.get().getOriginalProfile())
.setBoolean(BravePref.BACKGROUND_VIDEO_PLAYBACK_ENABLED, false);
}
return;
}
if (BravePrefServiceBridge.getInstance().getBackgroundVideoPlaybackEnabled()) {
if (UserPrefs.get(mTabModelProfileSupplier.get().getOriginalProfile())
.getBoolean(BravePref.BACKGROUND_VIDEO_PLAYBACK_ENABLED)) {
BraveFeatureUtil.enableFeature(
BraveFeatureList.BRAVE_BACKGROUND_VIDEO_PLAYBACK_INTERNAL, true, true);
}
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
+4 -11
View File
@@ -60,14 +60,6 @@ public class BravePrefServiceBridge {
return BravePrefServiceBridgeJni.get().getDesktopModeEnabled();
}
public void setBackgroundVideoPlaybackEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setBackgroundVideoPlaybackEnabled(enabled);
}
public boolean getBackgroundVideoPlaybackEnabled() {
return BravePrefServiceBridgeJni.get().getBackgroundVideoPlaybackEnabled();
}
public long getTrackersBlockedCount(Profile profile) {
return BravePrefServiceBridgeJni.get().getTrackersBlockedCount(profile);
}
@@ -130,16 +122,17 @@ public class BravePrefServiceBridge {
String getCookiesBlockType();
void setPlayYTVideoInBrowserEnabled(boolean enabled);
boolean getPlayYTVideoInBrowserEnabled();
void setDesktopModeEnabled(boolean enabled);
boolean getDesktopModeEnabled();
void setBackgroundVideoPlaybackEnabled(boolean enabled);
boolean getBackgroundVideoPlaybackEnabled();
long getTrackersBlockedCount(Profile profile);
long getAdsBlockedCount(Profile profile);
long getDataSaved(Profile profile);
// Used to pass total stat from upgrading old tabs based browser
android/java/org/chromium/chrome/browser/settings/MediaPreferences.java
+3 -1
View File
@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.shields.FilterListServiceFactory;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.mojo.bindings.ConnectionErrorHandler;
import org.chromium.mojo.system.MojoException;
@@ -78,7 +79,8 @@ public class MediaPreferences extends BravePreferenceFragment
backgroundVideoPlaybackPref.setOnPreferenceChangeListener(this);
boolean enabled =
ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_BACKGROUND_VIDEO_PLAYBACK)
|| BravePrefServiceBridge.getInstance().getBackgroundVideoPlaybackEnabled();
|| UserPrefs.get(getProfile())
.getBoolean(BravePref.BACKGROUND_VIDEO_PLAYBACK_ENABLED);
backgroundVideoPlaybackPref.setChecked(enabled);
}