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

Commit 1d9343ec authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Browser: Pick help icon fix from cromite

parent 06d03a91

build/e_patches/0056-Browser-fix-help-icon-crash.patch→build/bromite_patches/00Disable-Feeback-Collector.patch

+55 −0
Original line number Original line Diff line number Diff line 
From b24797adad5aac6904b69909b14fa73456ed1f6c Mon Sep 17 00:00:00 2001

From: uazo <uazo@users.noreply.github.com>

From: althafvly <althafvly@gmail.com>

Date: Sat, 22 Jul 2023 13:58:40 +0000

Date: Fri, 20 Oct 2023 21:49:42 +0530

Subject: Disable Feeback Collector

Subject: [PATCH] Browser: fix help icon crash





License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

---

---

 .../chrome/browser/feedback/FeedbackCollector.java       | 9 +++++----

 .../browser/feedback/FeedbackCollector.java   | 27 +++----------------

 1 file changed, 5 insertions(+), 4 deletions(-)

 1 file changed, 3 insertions(+), 24 deletions(-)





diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

index cea9d24efc3ec..0d0d94bbd0cac 100644

--- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

--- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

+++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

+++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

@@ -28,6 +28,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;

@@ -28,6 +28,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
@@ -19,25 +18,38 @@ index cea9d24efc3ec..0d0d94bbd0cac 100644 
 import java.util.List;

 import java.util.List;

 import java.util.Map;

 import java.util.Map;

 

 

@@ -66,14 +67,14 @@ public abstract class FeedbackCollector<T> implements Runnable {

@@ -64,30 +65,8 @@ public abstract class FeedbackCollector<T> implements Runnable {

     // Subclasses must invoke init() at construction time.

     protected void init(Activity activity, @Nullable ScreenshotSource screenshotTask, T initParams,

             Profile profile) {

             Profile profile) {

         // 1. Build all synchronous and asynchronous sources and determine the currently signed in

-        // 1. Build all synchronous and asynchronous sources and determine the currently signed in

         //    account.

-        //    account.

-        mSynchronousSources = buildSynchronousFeedbackSources(activity, initParams);

-        mSynchronousSources = buildSynchronousFeedbackSources(activity, initParams);

-        mAsynchronousSources = buildAsynchronousFeedbackSources(initParams);

-        mAsynchronousSources = buildAsynchronousFeedbackSources(initParams);

-        IdentityManager identityManager =

-        IdentityManager identityManager =

-                IdentityServicesProvider.get().getIdentityManager(profile);

-        if (identityManager != null) {

-            mAccountInUse = CoreAccountInfo.getEmailFrom(

-                    identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN));

-        }

-

-        // Validation check in case a source is added to the wrong list.

-        for (FeedbackSource source : mSynchronousSources) {

-            assert !(source instanceof AsyncFeedbackSource);

-        }

-

-        // 2. Set |mScreenshotTask| if not null.

-        if (screenshotTask != null) mScreenshotTask = screenshotTask;

-

-        // 3. Start all asynchronous sources and the screenshot task.

-        for (var source : mAsynchronousSources) {

-            source.start(this);

-        }

-        if (mScreenshotTask != null) mScreenshotTask.capture(this);

+        mSynchronousSources = new ArrayList<>();

+        mSynchronousSources = new ArrayList<>();

+        mAsynchronousSources = new ArrayList<>();

+        mAsynchronousSources = new ArrayList<>();

+        /*IdentityManager identityManager =

                 IdentityServicesProvider.get().getIdentityManager(profile);

         if (identityManager != null) {

             mAccountInUse = CoreAccountInfo.getEmailFrom(

                     identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN));

-        }

+        }*/

 

 

         // Validation check in case a source is added to the wrong list.

         // 4. Kick off a task to timeout the async sources.

         for (FeedbackSource source : mSynchronousSources) {

         ThreadUtils.postOnUiThreadDelayed(this, TIMEOUT_MS);

--

--

2.34.1

2.25.1

build/bromite_patches_list.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -199,3 +199,4 @@ Add-webRTC-site-settings.patch 
Show-site-settings-for-cookies-javascript-and-ads.patch

Show-site-settings-for-cookies-javascript-and-ads.patch

Timezone-customization.patch

Timezone-customization.patch

AudioBuffer-AnalyserNode-fp-mitigations.patch

AudioBuffer-AnalyserNode-fp-mitigations.patch

00Disable-Feeback-Collector.patch

build/e_patches_list.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -53,5 +53,4 @@ 
0053-Browser-fix-adblock-rebranding.patch

0053-Browser-fix-adblock-rebranding.patch

0054-Browser-Remove-send-to-devices-option.patch

0054-Browser-Remove-send-to-devices-option.patch

0055-Browser-Enable-webRTC-by-default.patch

0055-Browser-Enable-webRTC-by-default.patch

0056-Browser-fix-help-icon-crash.patch

0057-Browser-Enable-webgl-by-default.patch
 
0057-Browser-Enable-webgl-by-default.patch