Merge pull request #9799 from brave/sync_cr93_fix_17580

Remove Chromium leftovers from sync types screen on Android
brave · Aug 25, 2021 · 9ce52e2 · 9ce52e2
1 parent 30d906b
commit 9ce52e2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java b/android/java/org/chromium/chrome/browser/sync/settings/BraveManageSyncSettings.java
@@ -15,10 +15,11 @@
 
 // See org.brave.bytecode.BraveManageSyncSettingsClassAdapter
 public class BraveManageSyncSettings extends ManageSyncSettings {
-    private Preference mGoogleActivityControls;
+    private static final String PREF_ADVANCED_CATEGORY = "advanced_category";
 
+    private Preference mTurnOffSync;
+    private Preference mGoogleActivityControls;
     private Preference mSyncEncryption;
-
     private Preference mManageSyncData;
 
     private CheckBoxPreference mSyncPaymentsIntegration;
@@ -27,10 +28,13 @@ public class BraveManageSyncSettings extends ManageSyncSettings {
     public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
 
+        getPreferenceScreen().removePreference(mTurnOffSync);
         getPreferenceScreen().removePreference(mGoogleActivityControls);
         getPreferenceScreen().removePreference(mSyncEncryption);
         getPreferenceScreen().removePreference(mManageSyncData);
 
+        findPreference(PREF_ADVANCED_CATEGORY).setVisible(false);
+
         mSyncPaymentsIntegration.setVisible(false);
     }
 }
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -442,6 +442,8 @@ public void testFieldsExist() throws Exception {
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/sync/settings/ManageSyncSettings",
                         "mSyncPaymentsIntegration"));
+        Assert.assertTrue(fieldExists(
+                "org/chromium/chrome/browser/sync/settings/ManageSyncSettings", "mTurnOffSync"));
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator",
                         "mMediator"));

diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java
@@ -16,6 +16,9 @@ public class BraveManageSyncSettingsClassAdapter extends BraveClassVisitor {
     BraveManageSyncSettingsClassAdapter(ClassVisitor visitor) {
         super(visitor);
 
+        deleteField(sBraveManageSyncSettingsClassName, "mTurnOffSync");
+        makeProtectedField(sManageSyncSettingsClassName, "mTurnOffSync");
+
         deleteField(sBraveManageSyncSettingsClassName, "mGoogleActivityControls");
         makeProtectedField(sManageSyncSettingsClassName, "mGoogleActivityControls");