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

Merge pull request #16540 from brave/android_safebrowsing_by_default

Browse Source 
Enables Safe Browsing flag on Android by default
This commit is contained in:
Serg
2023-01-06 14:17:16 -05:00
committed by GitHub
parent 90ef3b356c 6a612f6873
commit 0f33fe5ef7
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+20 -10
View File
@@ -197,6 +197,7 @@ import org.chromium.components.safe_browsing.BraveSafeBrowsingApiHandler;
import org.chromium.components.safe_browsing.SafeBrowsingApiBridge;
import org.chromium.components.search_engines.TemplateUrl;
import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.content_public.browser.UiThreadTaskTraits;
import org.chromium.content_public.browser.WebContents;
import org.chromium.mojo.bindings.ConnectionErrorHandler;
import org.chromium.mojo.system.MojoException;
@@ -270,6 +271,7 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
private boolean isProcessingPendingDappsTxRequest;
private int mLastTabId;
private boolean mNativeInitialized;
private boolean mSafeBrowsingFlagEnabled;
private NewTabPageManager mNewTabPageManager;
private NotificationPermissionController mNotificationPermissionController;
private BraveNewsController mBraveNewsController;
@@ -307,15 +309,13 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
}
updateWalletBadgeVisibility();
}
boolean safeBrowsingFlagEnabled =
// We can store a state of that flag as a browser has to be restarted
// when the flag state is changed in any case
mSafeBrowsingFlagEnabled =
ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_ANDROID_SAFE_BROWSING);
boolean safeBrowsingPrefEnabled =
SafeBrowsingBridge.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING;
if (safeBrowsingFlagEnabled && safeBrowsingPrefEnabled) {
executeInitSafeBrowsing(0);
} else if (!safeBrowsingFlagEnabled && safeBrowsingPrefEnabled) {
SafeBrowsingBridge.setSafeBrowsingState(SafeBrowsingState.NO_SAFE_BROWSING);
}
executeInitSafeBrowsing(0);
}
@Override
@@ -830,6 +830,11 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
SafeBrowsingBridge.setSafeBrowsingState(SafeBrowsingState.NO_SAFE_BROWSING);
}
@Override
public boolean isSafeBrowsingEnabled() {
return mSafeBrowsingFlagEnabled;
}
@Override
public Activity getActivity() {
return this;
@@ -1995,8 +2000,13 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
// BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS,
// as upstream does, to keep the GmsCore process alive.
private void executeInitSafeBrowsing(long delay) {
PostTask.postDelayedTask(TaskTraits.USER_VISIBLE_MAY_BLOCK, () -> {
BraveSafeBrowsingApiHandler.getInstance().initSafeBrowsing();
// SafeBrowsingBridge.getSafeBrowsingState() has to be executed on a main thread
PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT, () -> {
if (SafeBrowsingBridge.getSafeBrowsingState() != SafeBrowsingState.NO_SAFE_BROWSING) {
// initSafeBrowsing could be executed on a background thread
PostTask.postTask(TaskTraits.USER_VISIBLE_MAY_BLOCK,
() -> { BraveSafeBrowsingApiHandler.getInstance().initSafeBrowsing(); });
}
executeInitSafeBrowsing(BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS);
}, delay);
}