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

Commit 43025219 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Fix crash in privacy and security settings 

One preference that we were removing has been put under a flag so we
don't need to remove it

https://gitlab.e.foundation/e/os/chromium/-/commit/7cd1ebebd122f0ca4243beedfe312d6776f89986
parent 4fc1c385

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

+5 −5
Original line number Diff line number Diff line 
From 7d9786f58085457727d0b35e747e7a633c07d295 Mon Sep 17 00:00:00 2001

From 9c795d12032aef6093e246f9bb70e91beece3c7b 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
@@ -91,7 +91,7 @@ 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 9507b7fb6098a..e719bd05fe82b 100644

index 228944ae9d304..5d45545a8b404 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
@@ -102,7 +102,7 @@ index 9507b7fb6098a..e719bd05fe82b 100644 
 

     private static final String PREF_HISTORY_EXPIRE_DAYS_THRESHOLD = "history_expire_days_threshold";

 

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

@@ -409,6 +410,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 9507b7fb6098a..e719bd05fe82b 100644 
 

     @Override

     public boolean onPreferenceChange(Preference preference, Object newValue) {

@@ -456,6 +458,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -455,6 +457,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 9507b7fb6098a..e719bd05fe82b 100644 
         }

         return true;

     }

@@ -498,6 +504,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

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

         openExternalLinksPref.setOnPreferenceChangeListener(this);

         openExternalLinksPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

build/e_patches/Remove-some-privacy-UI-pref.patch

+6 −7
Original line number Diff line number Diff line 
From e17e8a6b6061e4a1c53411be7b33a3303be06757 Mon Sep 17 00:00:00 2001

From 4962a7db373233ab5957e296e23a76e037fc8b4b Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Mon, 12 Feb 2024 14:21:50 +0530

Subject: Remove some privacy UI pref



---

 .../chrome/browser/privacy/settings/PrivacySettings.java     | 5 +++++

 1 file changed, 5 insertions(+)

 .../chrome/browser/privacy/settings/PrivacySettings.java      | 4 ++++

 1 file changed, 4 insertions(+)



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 702a8b21b9396..9507b7fb6098a 100644

index 702a8b21b9396..228944ae9d304 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

@@ -232,6 +232,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -232,6 +232,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

         mContextualSearch.setSummary(

                 isContextualSearchEnabled ? R.string.text_on : R.string.text_off);

 

+        getPreferenceScreen().removePreference(findPreference("phone_as_a_security_key"));

+        getPreferenceScreen().removePreference(mContextualSearch);

+

         ChromeSwitchPreference canMakePaymentPref =

                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         canMakePaymentPref.setOnPreferenceChangeListener(this);

@@ -286,6 +289,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -286,6 +288,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

         Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);

         syncAndServicesLink.setSummary(buildFooterString());