Merge branch '2508-master-adblock_url' into 'master'

src/

apks/

bin/

_gclient_src*/

.ccache/

.cipd/

    name: "$CI_JOB_NAME"

    paths:

      - apks/*

      - bin/*

build-cromite-arm:

  stage: build

FROM ubuntu:20.04

ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "127.0.6533.103"

ENV CHROMIUM_VER "127.0.6533.106"

RUN dpkg --add-architecture i386

    echo ">> [$(date)] Creating archive with debug apks"

    archive_name="${root_dir}/apks/${apk_arch}/browser_${apk_arch}_debug_apks.7z"

    7z a -t7z -mx=9 "$archive_name" "out/${1}/apks"/*.apk

    if [ $1 '==' "x64" ]; then

        echo ">> [$(date)] Building chromium subresource_filter_tools"

        mkdir -p "${root_dir}/bin"

        build_args=$(cat "${root_dir}"/build/filters.gn_args)

        build_args+=' cc_wrapper="ccache"'

        gn gen out/${1} --args="$build_args"

        autoninja -C out/${1} subresource_filter_tools

        if [ -f "out/${1}/ruleset_converter" ]; then

            cp -r out/${1}/ruleset_converter ${root_dir}/bin/ruleset_converter

        fi

    fi

}

setup_ccache() {

From 9a9eda608ee4cf68f82f5d8060b4df134efa34fc Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 10 Sep 2024 12:17:23 +0530

Subject: [PATCH] Browser: Change adblock url to ours

---

 chrome/android/java/res/values/values.xml                | 2 +-

 .../chromium/chrome/browser/settings/AdBlockEditor.java  | 8 ++++++++

 chrome/browser/browser_process_impl.cc                   | 9 ++++++++-

 chrome/browser/net/system_network_context_manager.cc     | 2 +-

 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml

index 3b318d09034f4..09f051950404c 100644

--- a/chrome/android/java/res/values/values.xml

+++ b/chrome/android/java/res/values/values.xml

@@ -24,7 +24,7 @@ found in the LICENSE file.

     <string name="adblock_on">Autoupdate enabled</string>

     <string name="adblock_off">Autoupdate disabled</string>

-    <string name="adblock_help_url">https://www.bromite.org/custom-filters</string>

+    <string name="adblock_help_url">https://doc.e.foundation/browser-custom-filters</string>

     <string name="proxy_title">Proxy configuration</string>

     <string name="proxy_url">chrome://proxy</string>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java

index ef6d1652c97f0..24cd56084827d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java

@@ -37,6 +37,14 @@ public class AdBlockEditor extends Fragment implements TextWatcher {

         View scrollView = v.findViewById(R.id.scroll_view);

         scrollView.getViewTreeObserver().addOnScrollChangedListener(

                 SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));

+

+        String defaultBromiteURL = "https://www.bromite.org/filters/filters.dat";

+        if (defaultBromiteURL.equals(AdBlockNativeGateway.getAdBlockFiltersURL())) {

+            String newFiltersURL = "https://images.ecloud.global/apps/browser/filters.dat";

+            AdBlockNativeGateway.setAdBlockFiltersURL(

+                    UrlFormatter.fixupUrl(newFiltersURL).getSpec());

+        }

+

         mAdBlockFiltersUrlEdit = (EditText) v.findViewById(R.id.adblock_url_edit);

         mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL());

         mAdBlockFiltersUrlEdit.addTextChangedListener(this);

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index 74c5396245c07..fdbd35e786d0b 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -1208,12 +1208,19 @@ BrowserProcessImpl::adblock_updater() {

   std::unique_ptr<component_updater::UpdateScheduler> scheduler =

       std::make_unique<component_updater::TimerUpdateScheduler>();

+  std::string filters_url = local_state()->GetString(prefs::kAdBlockFiltersURL);

+

+  // Check if the current URL is Bromite filters URL. If so, use the new URL

+  if (!filters_url.empty() && filters_url == "https://www.bromite.org/filters/filters.dat") {

+    filters_url = "https://images.ecloud.global/apps/browser/filters.dat";

+  }

+

   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(

           g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),

           std::move(scheduler),

           g_browser_process->subresource_filter_ruleset_service(),

           local_state()->GetBoolean(prefs::kAdBlockEnabled),

-          local_state()->GetString(prefs::kAdBlockFiltersURL));

+          filters_url);

   return adblock_updater_.get();

 }

diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc

index 5aa4ba0c2dbc6..1232086093038 100644

--- a/chrome/browser/net/system_network_context_manager.cc

+++ b/chrome/browser/net/system_network_context_manager.cc

@@ -647,7 +647,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {

   registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);

   registry->RegisterStringPref(prefs::kAdBlockFiltersURL,

-    "https://www.bromite.org/filters/filters.dat");

+    "https://images.ecloud.global/apps/browser/filters.dat");

   // Static auth params

   registry->RegisterStringPref(prefs::kAuthSchemes,

-- 

2.34.1