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

Commit edaf4c0f authored by csagan5's avatar csagan5
Browse files

Fixes for unified consent and feed build issues

parent 4a9cbe67

build/patches/Allow-building-without-feed-support.patch

+52 −2
Original line number Diff line number Diff line
@@ -3,9 +3,59 @@ Date: Thu, 19 Dec 2019 22:52:53 +0100 
Subject: Allow building without feed support



---

 .../chrome/browser/ntp/cards/ExploreOfflineCard.java         | 5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)

 .../start_surface/StartSurfaceCoordinator.java   |  5 -----

 .../start_surface/StartSurfaceMediator.java      | 16 ----------------

 .../browser/ntp/cards/ExploreOfflineCard.java    |  5 +----

 3 files changed, 1 insertion(+), 25 deletions(-)



diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java

--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java

+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java

@@ -198,11 +198,6 @@ public class StartSurfaceCoordinator implements StartSurface {

             mBottomBarCoordinator = new BottomBarCoordinator(

                     mActivity, mActivity.getCompositorViewHolder(), mPropertyModel);

         }

-

-        mExploreSurfaceCoordinator = new ExploreSurfaceCoordinator(mActivity,

-                mSurfaceMode == SurfaceMode.SINGLE_PANE ? mTasksSurface.getBodyViewContainer()

-                                                        : mActivity.getCompositorViewHolder(),

-                mPropertyModel, mSurfaceMode == SurfaceMode.SINGLE_PANE);

     }

 

     private TabSwitcher.Controller initializeSecondaryTasksSurface() {

diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java

--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java

+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java

@@ -253,15 +253,6 @@ class StartSurfaceMediator

                 RecordUserAction.record("StartSurface.TasksOnly");

             }

 

-            // Make sure FeedSurfaceCoordinator is built before the explore surface is showing by

-            // default.

-            if (mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)

-                    && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null) {

-                mPropertyModel.set(FEED_SURFACE_COORDINATOR,

-                        mFeedSurfaceCreator.createFeedSurfaceCoordinator(

-                                mNightModeStateProvider.isInNightMode()));

-            }

-

             mPropertyModel.set(IS_SHOWING_OVERVIEW, true);

             mFakeboxDelegate.addUrlFocusChangeListener(mUrlFocusChangeListener);

         }

@@ -361,13 +352,6 @@ class StartSurfaceMediator

     private void setExploreSurfaceVisibility(boolean isVisible) {

         if (isVisible == mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)) return;

 

-        if (isVisible && mPropertyModel.get(IS_SHOWING_OVERVIEW)

-                && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null) {

-            mPropertyModel.set(FEED_SURFACE_COORDINATOR,

-                    mFeedSurfaceCreator.createFeedSurfaceCoordinator(

-                            mNightModeStateProvider.isInNightMode()));

-        }

-

         mPropertyModel.set(IS_EXPLORE_SURFACE_VISIBLE, isVisible);

 

         if (mSurfaceMode == SurfaceMode.TWO_PANES) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/ExploreOfflineCard.java

build/patches/Unified-consent-miscellanous-backport-fixes.patch

+57 −8
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ Date: Wed, 18 Dec 2019 23:54:37 +0100 
Subject: Unified consent miscellanous backport fixes



---

 .../privacy/PrivacyPreferences.java           | 38 -------------------

 .../sync/SyncNotificationController.java      | 12 ++----

 2 files changed, 3 insertions(+), 47 deletions(-)

 .../privacy/PrivacyPreferences.java           | 52 ++-----------------

 .../preferences/sync/SyncPreferenceUtils.java |  3 --

 .../sync/SyncNotificationController.java      | 12 ++---

 3 files changed, 6 insertions(+), 61 deletions(-)



diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
@@ -18,7 +19,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri 
 import android.view.Menu;

 import android.view.MenuInflater;

 import android.view.MenuItem;

@@ -56,13 +55,10 @@ public class PrivacyPreferences

@@ -45,7 +44,6 @@ public class PrivacyPreferences

     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";

     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";

     private static final String PREF_DO_NOT_TRACK = "do_not_track";

-    private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";

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

@@ -56,13 +54,10 @@ public class PrivacyPreferences

 

     @Override

     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -32,7 +41,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri 
 

         mManagedPreferenceDelegate = createManagedPreferenceDelegate();

 

@@ -76,39 +72,6 @@ public class PrivacyPreferences

@@ -76,41 +71,8 @@ public class PrivacyPreferences

         networkPredictionPref.setOnPreferenceChangeListener(this);

         networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
@@ -69,10 +78,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri 
-            updateSummaries();

-            return;

-        }

         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));

         preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));

-        preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));

-        preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));

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

+        getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));

 

@@ -176,7 +139,6 @@ public class PrivacyPreferences

         ChromeBaseCheckBoxPreference navigationErrorPref =

                 (ChromeBaseCheckBoxPreference) findPreference(PREF_NAVIGATION_ERROR);

@@ -123,7 +85,7 @@ public class PrivacyPreferences

         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

 

         if (!ContextualSearchFieldTrial.isEnabled()) {

-            preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));

+            getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));

         }

 

         // Listen to changes to the Extended Reporting pref.

@@ -176,7 +138,6 @@ public class PrivacyPreferences

      */

     public void updateSummaries() {

         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
@@ -80,6 +102,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri 
 

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

         CharSequence textOff = getActivity().getResources().getText(R.string.text_off);

@@ -226,13 +187,6 @@ public class PrivacyPreferences

             contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);

         }

 

-        Preference usageAndCrashPref = findPreference(PREF_USAGE_AND_CRASH_REPORTING);

-        if (usageAndCrashPref != null) {

-            usageAndCrashPref.setSummary(

-                    privacyPrefManager.isUsageAndCrashReportingPermittedByUser() ? textOn

-                                                                                 : textOff);

-        }

-

         Preference usageStatsPref = findPreference(PREF_USAGE_STATS);

         if (usageStatsPref != null) {

             if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java

@@ -118,9 +118,6 @@ public class SyncPreferenceUtils {

             if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {

                 return res.getString(R.string.sync_need_passphrase);

             }

-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) {

-                return context.getString(R.string.sync_and_services_summary_sync_on);

-            }

             return context.getString(R.string.account_management_sync_summary, accountName);

         }

         return context.getString(R.string.sync_is_disabled);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java