From 362af0ade34eebd3bccc66ed8eec6ebbc2188dd3 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Fri, 29 Jul 2022 23:17:21 +0300 Subject: [PATCH] Sync of default search engine between Android and Desktop Android uses native code to save DSE for normal tab --- .../settings/BraveSearchEngineAdapter.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java b/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java index 12efd8298a5..cd67de394a5 100644 --- a/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java +++ b/android/java/org/chromium/chrome/browser/search_engines/settings/BraveSearchEngineAdapter.java @@ -37,6 +37,12 @@ public class BraveSearchEngineAdapter extends SearchEngineAdapter { } static public void updateActiveDSE(boolean isPrivate) { + // For the regular tab, trust the native Chromium's TemplateUrlService and + // don't overwrite with our value to make sync work + if (isPrivate == false) { + return; + } + TemplateUrl templateUrl = getTemplateUrlByShortName(getDSEShortName(isPrivate)); if (templateUrl == null) { return; @@ -51,6 +57,12 @@ public class BraveSearchEngineAdapter extends SearchEngineAdapter { TemplateUrlServiceFactory.get().getDefaultSearchEngineTemplateUrl(); if (dseTemplateUrl != null) defaultSearchEngineName = dseTemplateUrl.getShortName(); + if (isPrivate == false) { + // For the regular tab, rely on the value from the native Chromium's + // TemplateUrlService to make sync work + return defaultSearchEngineName; + } + // TODO(sergz): A check, do we need to fetch a default SE from native and avoid // overwrite. if (BraveSearchEnginePrefHelper.getInstance().getFetchSEFromNative()) {