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

Add pref change callback

Browse Source 
Resolve rebase error
This commit is contained in:
Deep
2022-08-22 23:05:38 -04:00
parent 86b1feb6d3
commit 29ec8d1255
11 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveApplicationImplBase.java
+1 -1
View File
@@ -24,4 +24,4 @@ public class BraveApplicationImplBase extends SplitCompatApplication.Impl {
});
}
}
}
}
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+12 -1
View File
@@ -121,6 +121,8 @@ import org.chromium.chrome.browser.onboarding.v2.HighlightView;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.BravePreferenceKeys;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettings;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
@@ -186,7 +188,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
@JNINamespace("chrome::android")
public abstract class BraveActivity<C extends ChromeActivityComponent> extends ChromeActivity
implements BrowsingDataBridge.OnClearBrowsingDataListener, BraveVpnObserver,
OnBraveSetDefaultBrowserListener, ConnectionErrorHandler {
OnBraveSetDefaultBrowserListener, ConnectionErrorHandler, PrefObserver {
public static final String ADD_FUNDS_URL = "brave://rewards/#add-funds";
public static final String BRAVE_REWARDS_SETTINGS_URL = "brave://rewards/";
public static final String BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL =
@@ -720,12 +722,21 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
BraveHelper.DisableFREDRP();
}
@Override
public void onPreferenceChange() {
Log.e("BraveCaptcha", "Pref changed");
Log.e("BraveCaptcha", BravePrefServiceBridge.getInstance().getCaptchaId());
}
@Override
public void finishNativeInitialization() {
super.finishNativeInitialization();
BraveHelper.maybeMigrateSettings();
PrefChangeRegistrar mPrefChangeRegistrar = new PrefChangeRegistrar();
mPrefChangeRegistrar.addObserver("brave.rewards.scheduled_captcha.id", this);
if (SharedPreferencesManager.getInstance().readBoolean(
BravePreferenceKeys.BRAVE_DOUBLE_RESTART, false)) {
SharedPreferencesManager.getInstance().writeBoolean(
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
+6
View File
@@ -183,6 +183,10 @@ public class BravePrefServiceBridge {
return BravePrefServiceBridgeJni.get().getUseRewardsStagingServer();
}
public String getCaptchaId() {
return BravePrefServiceBridgeJni.get().getCaptchaId();
}
public void setOldTrackersBlockedCount(Profile profile, long count) {
BravePrefServiceBridgeJni.get().setOldTrackersBlockedCount(profile, count);
}
@@ -368,5 +372,7 @@ public class BravePrefServiceBridge {
void setShowNews(boolean value);
boolean getShowNews();
String getCaptchaId();
}
}