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

Commit 21c6b879 authored by csagan5's avatar csagan5
Browse files

Updated patches for v85

parent 67177304

build/patches/Add-custom-tab-intents-privacy-option.patch

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis 
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

--- 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

@@ -51,6 +51,8 @@ public class PrivacySettings

@@ -50,6 +50,8 @@ public class PrivacySettings

 

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     @Override

     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

         PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();

@@ -91,6 +93,10 @@ public class PrivacySettings

@@ -90,6 +92,10 @@ public class PrivacySettings

                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);

         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {

             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {

             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);

         }

@@ -126,6 +132,11 @@ public class PrivacySettings

@@ -125,6 +131,11 @@ public class PrivacySettings

                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));

         }

build/patches/Add-history-support-in-incognito-mode.patch

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ new mode 100755 
 /**

  * Fragment to keep track of the all the privacy related preferences.

  */

@@ -55,6 +57,7 @@ public class PrivacySettings

@@ -54,6 +56,7 @@ public class PrivacySettings

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

 

     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
@@ -62,7 +62,7 @@ new mode 100755 
 

     @Override

     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

@@ -85,6 +88,11 @@ public class PrivacySettings

@@ -84,6 +87,11 @@ public class PrivacySettings

         searchSuggestionsPref.setOnPreferenceChangeListener(this);

         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
@@ -74,7 +74,7 @@ new mode 100755 
         updateSummaries();

     }

 

@@ -106,6 +114,9 @@ public class PrivacySettings

@@ -105,6 +113,9 @@ public class PrivacySettings

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

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

             sharedPreferencesEditor.apply();
@@ -84,7 +84,7 @@ new mode 100755 
         }

 

         return true;

@@ -180,6 +191,13 @@ public class PrivacySettings

@@ -179,6 +190,13 @@ public class PrivacySettings

                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);

         closeTabsOnExitPref.setOnPreferenceChangeListener(this);

         closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

build/patches/Add-option-to-not-persist-tabs-across-sessions.patch

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";

     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";

     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";

@@ -99,6 +102,10 @@ public class PrivacySettings

@@ -98,6 +101,10 @@ public class PrivacySettings

             sharedPreferencesEditor.apply();

         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {

             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         }

 

         return true;

@@ -168,6 +175,11 @@ public class PrivacySettings

@@ -167,6 +174,11 @@ public class PrivacySettings

                         String.format("%s - %s", getString(R.string.text_on), serverName));

             }

         }

build/patches/Bromite-AdBlockUpdaterService.patch

+17 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Disable look-alike, metrics, ablation and navigation throttles 
Do not use experiments to enable/disable presets

Always enable ad filtering

Download filters by checking Last-Modified header first

Fix RestoreForeignSessionTab by recreating the tab (issue #681)

---

 chrome/browser/after_startup_task_utils.cc    |   5 +

 chrome/browser/browser_process.h              |   7 +
@@ -13,6 +14,7 @@ Download filters by checking Last-Modified header first 
 chrome/browser/browser_process_impl.h         |   3 +

 chrome/browser/chrome_browser_main.cc         |   2 +

 .../browser/chrome_content_browser_client.cc  |  16 --

 .../sessions/session_restore_android.cc       |   4 +-

 components/component_updater/BUILD.gn         |   8 +

 .../adblock_updater_service.cc                | 249 ++++++++++++++++++

 .../adblock_updater_service.h                 |  99 +++++++
@@ -27,7 +29,7 @@ Download filters by checking Last-Modified header first 
 .../browser/subresource_filter_features.cc    | 113 +-------

 .../core/common/common_features.cc            |   2 +-

 .../frame_host/navigation_throttle_runner.cc  |   5 -

 20 files changed, 809 insertions(+), 138 deletions(-)

 21 files changed, 812 insertions(+), 139 deletions(-)

 create mode 100644 components/component_updater/adblock_updater_service.cc

 create mode 100644 components/component_updater/adblock_updater_service.h

 create mode 100644 components/component_updater/download_filters_task.cc
@@ -203,6 +205,20 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 
   MaybeAddThrottle(PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle),

                    &throttles);

 

diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc

--- a/chrome/browser/sessions/session_restore_android.cc

+++ b/chrome/browser/sessions/session_restore_android.cc

@@ -43,7 +43,9 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(

   TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents);

   DCHECK(current_tab);

   if (disposition == WindowOpenDisposition::CURRENT_TAB) {

-    current_tab->SwapWebContents(std::move(new_web_contents), false, false);

+    int active_tab_index = tab_model->GetActiveIndex();

+    tab_model->CreateTab(current_tab, new_web_contents.release());

+    tab_model->CloseTabAt(active_tab_index);

   } else {

     DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||

            disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);

diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn

--- a/components/component_updater/BUILD.gn

+++ b/components/component_updater/BUILD.gn

build/patches/Disable-safe-browsing.patch

+6 −6
Original line number Diff line number Diff line
@@ -205,15 +205,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";

     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";

     private static final String PREF_SECURE_DNS = "secure_dns";

@@ -55,7 +50,6 @@ public class PrivacySettings

@@ -54,7 +49,6 @@ public class PrivacySettings

     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";

     private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =

             "sync_and_services_link_divider";

     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

-    private static final String PREF_USAGE_STATS = "usage_stats_reporting";

     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

 

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

@@ -87,28 +81,11 @@ public class PrivacySettings

@@ -86,28 +80,11 @@ public class PrivacySettings

         getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));

         getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
@@ -242,7 +242,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         updateSummaries();

     }

 

@@ -122,13 +99,6 @@ public class PrivacySettings

@@ -121,13 +98,6 @@ public class PrivacySettings

             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);

         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {

             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -256,7 +256,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         }

 

         return true;

@@ -149,32 +119,12 @@ public class PrivacySettings

@@ -148,32 +118,12 @@ public class PrivacySettings

         CharSequence textOn = getActivity().getResources().getText(R.string.text_on);

         CharSequence textOff = getActivity().getResources().getText(R.string.text_off);
@@ -289,7 +289,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
         CheckBoxPreference canMakePaymentPref =

                 (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         if (canMakePaymentPref != null) {

@@ -213,42 +163,14 @@ public class PrivacySettings

@@ -212,42 +162,14 @@ public class PrivacySettings

                         String.format("%s - %s", getString(R.string.text_on), serverName));

             }

         }