Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51f49a02 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Update e patches

parent c8ae361d

build/e_patches/Browser-Add-provider-to-share-default-search-engine.patch

+6 −6
Original line number Diff line number Diff line 
From 50e11576844d59a5c90b8c6f2d5afdb3c7930f2d Mon Sep 17 00:00:00 2001

From c96b4063b13a9a1d38c0063a6250fea145d8db7b Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 08:03:13 +0000

Subject: Browser: Add provider to share default search engine
@@ -12,11 +12,11 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email> 
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java



diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index de52e4416e2fe..fed30360f4a8f 100644

index 46ddd924dae7e..e9f1ce7e50ed9 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -1301,6 +1301,12 @@ by a child template that "extends" this file.

             android:grantUriPermissions="true">

@@ -1326,6 +1326,12 @@ by a child template that "extends" this file.

           tools:ignore="ExportedContentProvider">

       </provider>

 

+      <!-- Provider for search engine data. -->
@@ -114,10 +114,10 @@ index 0000000000000..299562413fe05 
+    }

+}

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni

index 8b061b9741a97..185f08c123009 100644

index 9c175c0d24804..eccb0847f7cd6 100644

--- a/chrome/android/java_sources.gni

+++ b/chrome/android/java_sources.gni

@@ -58,3 +58,4 @@ if (enable_cardboard) {

@@ -29,3 +29,4 @@ if (enable_cardboard) {

 }

 

 chrome_java_sources += userscripts_java_sources

build/e_patches/Browser-Change-adblock-url-to-ours.patch

+6 −6
Original line number Diff line number Diff line 
From 05a6a9e82966b75ae557e6851dffc9d9a9b77c30 Mon Sep 17 00:00:00 2001

From f0dee9e987e3b3b61ceec0752207c586fccb227c Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

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

Subject: Browser: Change adblock url to ours
@@ -43,10 +43,10 @@ index ef6d1652c97f0..24cd56084827d 100644 
         mAdBlockFiltersUrlEdit.setText(AdBlockNativeGateway.getAdBlockFiltersURL());

         mAdBlockFiltersUrlEdit.addTextChangedListener(this);

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

index bf0cf434bb966..f2bd21a6dbd93 100644

index f7213b3c8777f..85d715c53ff41 100644

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

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

@@ -1231,11 +1231,11 @@ BrowserProcessImpl::adblock_updater() {

@@ -1251,11 +1251,11 @@ BrowserProcessImpl::adblock_updater() {

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

       std::make_unique<component_updater::TimerUpdateScheduler>();
@@ -63,7 +63,7 @@ index bf0cf434bb966..f2bd21a6dbd93 100644 
   }

 

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

@@ -1243,7 +1243,7 @@ BrowserProcessImpl::adblock_updater() {

@@ -1263,7 +1263,7 @@ BrowserProcessImpl::adblock_updater() {

           std::move(scheduler),

           g_browser_process->subresource_filter_ruleset_service(),

           local_state()->GetBoolean(prefs::kAdBlockEnabled),
@@ -73,10 +73,10 @@ index bf0cf434bb966..f2bd21a6dbd93 100644 
   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 414d6b7e350ce..3393bd2a958c5 100644

index 75be09b615fca..6eec2f773af01 100644

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

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

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

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

 

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

   registry->RegisterStringPref(prefs::kAdBlockFiltersURL,

build/e_patches/Browser-Disable-Android-native-autofill-by-default.patch

+2 −2
Original line number Diff line number Diff line 
From e3fcca87fce700d046a091e891b456372b04c8c4 Mon Sep 17 00:00:00 2001

From f6430b15ca89e4c6370ddf0515bd0b4f5ad10687 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 22 Aug 2023 06:16:40 +0000

Subject: Browser: Disable Android native autofill by default
@@ -8,7 +8,7 @@ Subject: Browser: Disable Android native autofill by default 
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc

index d375848541192..4cb69e4acdbfa 100644

index 8e5113f7318cd..3d48d92a09d17 100644

--- a/components/autofill/core/common/autofill_prefs.cc

+++ b/components/autofill/core/common/autofill_prefs.cc

@@ -46,7 +46,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

build/e_patches/Browser-Enable-custom-tabs-by-default.patch

+3 −3
Original line number Diff line number Diff line 
From 07b2846726d1897a822da717b357e6d6b02e6c1c Mon Sep 17 00:00:00 2001

From 15df80328edbd3593e59b077753585f377dfd48a Mon Sep 17 00:00:00 2001

From: Aayush Gupta <aayushgupta219@gmail.com>

Date: Mon, 29 Nov 2021 03:37:37 +0000

Subject: Browser: Enable custom tabs by default
@@ -11,10 +11,10 @@ Signed-off-by: althafvly <althafvly@gmail.com> 
 2 files changed, 2 insertions(+), 2 deletions(-)



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

index bff9d3bee4eb8..a256c92115cff 100644

index acf2f399ef151..32672a37830e3 100644

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

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

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

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

         android:key="allow_custom_tab_intents"

         android:title="@string/allow_custom_tab_intents_title"

         android:summary="@string/allow_custom_tab_intents_summary"

build/e_patches/Browser-Enable-external-intent-requests.patch

+9 −9
Original line number Diff line number Diff line 
From 9c795d12032aef6093e246f9bb70e91beece3c7b Mon Sep 17 00:00:00 2001

From 934dfd8ebc541920fd20cf9a49d239af00949c4f Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 5 Nov 2024 10:08:21 +0530

Subject: Browser: Enable external intent requests
@@ -17,10 +17,10 @@ Subject: Browser: Enable external intent requests 
 delete mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc



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

index a256c92115cff..c38eb74ff06f2 100644

index 32672a37830e3..b2329f2646d16 100644

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

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

@@ -92,8 +92,7 @@ found in the LICENSE file.

@@ -86,8 +86,7 @@ found in the LICENSE file.

         android:key="allow_external_intent_requests"

         android:title="@string/allow_external_intent_requests_title"

         android:summary="@string/allow_external_intent_requests_summary"
@@ -31,7 +31,7 @@ index a256c92115cff..c38eb74ff06f2 100644 
         android:key="security_section"

         android:title="@string/security_section_title" />

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

index 3aa592e78abfa..35c5970cb157b 100644

index 270eb6a4750de..f056bb3900541 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

@@ -17,6 +17,7 @@ import androidx.annotation.VisibleForTesting;
@@ -91,10 +91,10 @@ index f293f54b31b00..a6b3082e44cfe 100644 
 

     @Override

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

index 228944ae9d304..5d45545a8b404 100644

index 6f878c3199cd0..8a2e2793018d3 100644

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

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

@@ -129,6 +129,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -124,6 +124,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

 

     private ChromeSwitchPreference allowCustomTabIntentsPref;

     private ChromeSwitchPreference openExternalLinksPref;
@@ -102,7 +102,7 @@ index 228944ae9d304..5d45545a8b404 100644 
 

     private static final String PREF_HISTORY_EXPIRE_DAYS_THRESHOLD = "history_expire_days_threshold";

 

@@ -409,6 +410,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -396,6 +397,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

 

     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";

     public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -110,7 +110,7 @@ index 228944ae9d304..5d45545a8b404 100644 
 

     @Override

     public boolean onPreferenceChange(Preference preference, Object newValue) {

@@ -455,6 +457,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -442,6 +444,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();

             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);

             sharedPreferencesEditor.apply();
@@ -121,7 +121,7 @@ index 228944ae9d304..5d45545a8b404 100644 
         }

         return true;

     }

@@ -497,6 +503,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -484,6 +490,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

         openExternalLinksPref.setOnPreferenceChangeListener(this);

         openExternalLinksPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);