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

[WIP] [Android] SafetyNetApiHandler interface has no startUriLookup method anymore

Browse Source 
To check the websites urls now SafeBrowsingApiHandler must be used.

This commit disables BraveSafeBrowsingApiHandler class, which in fact implements SafetyNetApiHandler.

Related Chromium changes:
https://source.chromium.org/chromium/chromium/src/+/e5700c49b75254cc1201a3bbea59b20b06328a27
	Remove remaining functions in the interface.

	Internal reference was removed in https://crrev.com/i/7648757

	OBSOLETE_HISTOGRAMS=No longer logged because URLs are checked through
	the new GMSCore Safe Browsing API.

	Bug: 40935425
	Change-Id: I3ab1e5783395c63586bd4c5163541161027004bb
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5837639

https://source.chromium.org/chromium/chromium/src/+/4d1a9d3d10a3d6e1697270afc723687b6eb94810
	Remove unused functions after migrating URL checks to new GmsCore API.

	After the feature flag was removed in https://crrev.com/c/5805204,
	some functions, enums and histograms are no longer used.

	Some functions in the SafetyNetApiHandler interface are kept in this
	CL because they are still used in the internal repo. They will be
	removed in a follow-up CL.

	OBSOLETE_HISTOGRAMS=No longer logged because URLs are checked through
	the new GMSCore Safe Browsing API.

	Bug: 40935425
	Change-Id: I03cbc731ee14084f1af8ffe30670e50ea8175391
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5838697

https://source.chromium.org/chromium/chromium/src/+/42a1ef002790b1e5a7345c24ba3673224499d4f3
	Remove SafeBrowsingNewGmsApiForBrowseUrlDatabaseCheck feature flag

	This flag is set to enable by default since M129. Internal usage of
	this flag was removed in https://crrev.com/i/7608690.

	Bug: 40935425
	Change-Id: I83111aeefb92d52e5fdc938678764500e14992ef
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5805204
This commit is contained in:
AlexeyBarabash
2024-10-03 17:06:27 +01:00
committed by Claudio DeSouza
parent a2975f3e29
commit 7481e655de
5 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveApplicationImplBase.java
+12 -9
View File
@@ -10,22 +10,25 @@ import com.wireguard.android.backend.GoBackend;
import org.chromium.chrome.browser.base.SplitCompatApplication;
import org.chromium.chrome.browser.vpn.utils.BraveVpnProfileUtils;
import org.chromium.components.safe_browsing.BraveSafeBrowsingApiHandler;
import org.chromium.components.safe_browsing.SafeBrowsingApiBridge;
// TODO(alexeybarabash): needs to be redone for cr130
// import org.chromium.components.safe_browsing.BraveSafeBrowsingApiHandler;
public class BraveApplicationImplBase extends SplitCompatApplication.Impl {
@Override
public void onCreate() {
super.onCreate();
if (SplitCompatApplication.isBrowserProcess()) {
GoBackend.setAlwaysOnCallback(new GoBackend.AlwaysOnCallback() {
@Override
public void alwaysOnTriggered() {
BraveVpnProfileUtils.getInstance().startVpn(getApplication());
}
});
GoBackend.setAlwaysOnCallback(
new GoBackend.AlwaysOnCallback() {
@Override
public void alwaysOnTriggered() {
BraveVpnProfileUtils.getInstance().startVpn(getApplication());
}
});
// Set a handler for SafeBrowsing. It has to be done only once for a process lifetime.
SafeBrowsingApiBridge.setSafetyNetApiHandler(BraveSafeBrowsingApiHandler.getInstance());
// TODO(alexeybarabash): needs to be redone for cr130
// SafeBrowsingApiBridge.setSafetyNetApiHandler(BraveSafeBrowsingApiHandler.getInstance());
}
}
}
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+51 -42
View File
@@ -157,8 +157,6 @@ import org.chromium.chrome.browser.profiles.ProfileManager;
import org.chromium.chrome.browser.rate.BraveRateDialogFragment;
import org.chromium.chrome.browser.rate.RateUtils;
import org.chromium.chrome.browser.rewards.adaptive_captcha.AdaptiveCaptchaHelper;
import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
import org.chromium.chrome.browser.safe_browsing.SafeBrowsingState;
import org.chromium.chrome.browser.set_default_browser.BraveSetDefaultBrowserUtils;
import org.chromium.chrome.browser.set_default_browser.OnBraveSetDefaultBrowserListener;
import org.chromium.chrome.browser.settings.BraveNewsPreferencesV2;
@@ -205,7 +203,8 @@ import org.chromium.chrome.browser.vpn.wireguard.WireguardConfigUtils;
import org.chromium.components.browser_ui.settings.SettingsLauncher;
import org.chromium.components.embedder_support.util.UrlConstants;
import org.chromium.components.embedder_support.util.UrlUtilities;
import org.chromium.components.safe_browsing.BraveSafeBrowsingApiHandler;
// TODO(alexeybarabash): needs to be redone for cr130
// import org.chromium.components.safe_browsing.BraveSafeBrowsingApiHandler;
import org.chromium.components.search_engines.TemplateUrl;
import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.content_public.browser.WebContents;
@@ -231,7 +230,8 @@ public abstract class BraveActivity extends ChromeActivity
OnBraveSetDefaultBrowserListener,
ConnectionErrorHandler,
PrefObserver,
BraveSafeBrowsingApiHandler.BraveSafeBrowsingApiHandlerDelegate,
// TODO(alexeybarabash): needs to be redone for cr130
// BraveSafeBrowsingApiHandler.BraveSafeBrowsingApiHandlerDelegate,
BraveNewsConnectionErrorHandler.BraveNewsConnectionErrorHandlerDelegate,
MiscAndroidMetricsConnectionErrorHandler
.MiscAndroidMetricsConnectionErrorHandlerDelegate {
@@ -345,14 +345,17 @@ public abstract class BraveActivity extends ChromeActivity
}
}
BraveSafeBrowsingApiHandler.getInstance().setDelegate(
BraveActivityJni.get().getSafeBrowsingApiKey(), this);
// TODO(alexeybarabash): needs to be redone for cr130
// BraveSafeBrowsingApiHandler.getInstance().setDelegate(
// BraveActivityJni.get().getSafeBrowsingApiKey(), this);
// 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);
executeInitSafeBrowsing(0);
// TODO(alexeybarabash): needs to be redone for cr130
// executeInitSafeBrowsing(0);
if (ENABLE_IN_APP_UPDATE) {
if (mAppUpdateManager == null) {
@@ -478,7 +481,8 @@ public abstract class BraveActivity extends ChromeActivity
NotificationPermissionController.detach(mNotificationPermissionController);
mNotificationPermissionController = null;
}
BraveSafeBrowsingApiHandler.getInstance().shutdownSafeBrowsing();
// TODO(alexeybarabash): needs to be redone for cr130
// BraveSafeBrowsingApiHandler.getInstance().shutdownSafeBrowsing();
if (ENABLE_IN_APP_UPDATE && mAppUpdateManager != null) {
mAppUpdateManager.unregisterListener(mInstallStateUpdatedListener);
}
@@ -960,21 +964,24 @@ public abstract class BraveActivity extends ChromeActivity
maybeSolveAdaptiveCaptcha();
}
@Override
public void turnSafeBrowsingOff() {
SafeBrowsingBridge safeBrowsingBridge = new SafeBrowsingBridge(getCurrentProfile());
safeBrowsingBridge.setSafeBrowsingState(SafeBrowsingState.NO_SAFE_BROWSING);
}
// TODO(alexeybarabash): needs to be redone for cr130
// @Override
// public void turnSafeBrowsingOff() {
// SafeBrowsingBridge safeBrowsingBridge = new SafeBrowsingBridge(getCurrentProfile());
// safeBrowsingBridge.setSafeBrowsingState(SafeBrowsingState.NO_SAFE_BROWSING);
// }
@Override
public boolean isSafeBrowsingEnabled() {
return mSafeBrowsingFlagEnabled;
}
// TODO(alexeybarabash): needs to be redone for cr130
// @Override
// public boolean isSafeBrowsingEnabled() {
// return mSafeBrowsingFlagEnabled;
// }
@Override
public Activity getActivity() {
return this;
}
// TODO(alexeybarabash): needs to be redone for cr130
// @Override
// public Activity getActivity() {
// return this;
// }
public void maybeSolveAdaptiveCaptcha() {
String captchaID =
@@ -2389,27 +2396,29 @@ public abstract class BraveActivity extends ChromeActivity
// We call that method with an interval
// BraveSafeBrowsingApiHandler.SAFE_BROWSING_INIT_INTERVAL_MS,
// as upstream does, to keep the GmsCore process alive.
private void executeInitSafeBrowsing(long delay) {
// SafeBrowsingBridge.getSafeBrowsingState() has to be executed on a main thread
PostTask.postDelayedTask(
TaskTraits.UI_DEFAULT,
() -> {
SafeBrowsingBridge safeBrowsingBridge =
new SafeBrowsingBridge(getCurrentProfile());
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);
}
// TODO(alexeybarabash): needs to be redone for cr130
// private void executeInitSafeBrowsing(long delay) {
// // SafeBrowsingBridge.getSafeBrowsingState() has to be executed on a main thread
// PostTask.postDelayedTask(
// TaskTraits.UI_DEFAULT,
// () -> {
// SafeBrowsingBridge safeBrowsingBridge =
// new SafeBrowsingBridge(getCurrentProfile());
// 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);
// }
public void updateBottomSheetPosition(int orientation) {
if (BottomToolbarConfiguration.isBottomToolbarEnabled()) {