update Disable-sync-services-menu-entry.patch

This commit is contained in:
Carmelo Messina 2020-11-16 19:53:06 +01:00
parent 916169fd14
commit f545de305f

View file

@ -3,9 +3,10 @@ Date: Mon, 11 Nov 2019 23:09:48 +0100
Subject: Disable sync services menu entry
---
chrome/android/java/res/xml/main_preferences.xml | 11 ++---------
chrome/android/java/res/xml/privacy_preferences.xml | 5 -----
2 files changed, 2 insertions(+), 14 deletions(-)
.../android/java/res/xml/main_preferences.xml | 11 ++---------
.../java/res/xml/privacy_preferences.xml | 5 -----
.../sync/settings/SyncSettingsUtils.java | 17 -----------------
3 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
@ -48,6 +49,33 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
- app:allowDividerBelow="false"
- android:order="7"/>
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
@@ -256,23 +256,6 @@ public class SyncSettingsUtils {
}
boolean syncEnabled = AndroidSyncSettings.get().isSyncEnabled();
- if (syncEnabled) {
- if (!profileSyncService.isSyncActive()) {
- return res.getString(R.string.sync_setup_progress);
- }
-
- if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {
- return res.getString(R.string.sync_need_passphrase);
- }
-
- if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) {
- return profileSyncService.isEncryptEverythingEnabled()
- ? context.getString(R.string.sync_error_card_title)
- : context.getString(R.string.sync_passwords_error_card_title);
- }
-
- return context.getString(R.string.sync_and_services_summary_sync_on);
- }
return context.getString(R.string.sync_is_disabled);
}
--
2.17.1