diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 5684bc9a551..5ed0c6c9985 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -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); } diff --git a/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java b/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java index 581ce3f38ff..b82e717ba55 100644 --- a/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java +++ b/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java @@ -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 diff --git a/android/java/org/chromium/chrome/browser/settings/MediaPreferences.java b/android/java/org/chromium/chrome/browser/settings/MediaPreferences.java index 5167b5a9786..14662b16b3a 100644 --- a/android/java/org/chromium/chrome/browser/settings/MediaPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/MediaPreferences.java @@ -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); } diff --git a/browser/android/preferences/brave_pref_service_bridge.cc b/browser/android/preferences/brave_pref_service_bridge.cc index c6ff7af7ed2..211c78048e6 100644 --- a/browser/android/preferences/brave_pref_service_bridge.cc +++ b/browser/android/preferences/brave_pref_service_bridge.cc @@ -106,19 +106,6 @@ jboolean JNI_BravePrefServiceBridge_GetPlayYTVideoInBrowserEnabled( kPlayYTVideoInBrowserEnabled); } -void JNI_BravePrefServiceBridge_SetBackgroundVideoPlaybackEnabled( - JNIEnv* env, - jboolean enabled) { - return GetOriginalProfile()->GetPrefs()->SetBoolean( - kBackgroundVideoPlaybackEnabled, enabled); -} - -jboolean JNI_BravePrefServiceBridge_GetBackgroundVideoPlaybackEnabled( - JNIEnv* env) { - return GetOriginalProfile()->GetPrefs()->GetBoolean( - kBackgroundVideoPlaybackEnabled); -} - void JNI_BravePrefServiceBridge_SetDesktopModeEnabled(JNIEnv* env, jboolean enabled) { return GetOriginalProfile()->GetPrefs()->SetBoolean(kDesktopModeEnabled,