Uplift of #4984 (squashed) to beta

brave · Mar 23, 2020 · 072c151 · 072c151
1 parent 5608927
commit 072c151
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/...g/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java b/...g/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java
@@ -19,22 +19,29 @@
 public class BraveClearBrowsingDataPreferencesAdvanced extends ClearBrowsingDataPreferencesAdvanced {
     private static final int CLEAR_DOWNLOADS = DialogOption.NUM_ENTRIES;
 
-    @Override
-    protected List<Integer> getDialogOptions() {
-        return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
-                DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS,
-                DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS, CLEAR_DOWNLOADS);
-    }
+    // TODO(samartnik): disabling option as it requires futher research
+    // At the moment causes issue https://github.com/brave/brave-browser/issues/8737
+    // @Override
+    // protected List<Integer> getDialogOptions() {
+    //     return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
+    //             DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS,
+    //             DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS, CLEAR_DOWNLOADS);
+    // }
 
-    @Override
-    protected Set<Integer> getAllOptions() {
-        Set<Integer> all = super.getAllOptions();
-        all.add(CLEAR_DOWNLOADS);
-        return all;
-    }
+    // TODO(samartnik): disabling option as it requires futher research
+    // At the moment causes issue https://github.com/brave/brave-browser/issues/8737
+    // @Override
+    // protected Set<Integer> getAllOptions() {
+    //     Set<Integer> all = super.getAllOptions();
+    //     all.add(CLEAR_DOWNLOADS);
+    //     return all;
+    // }
 
     static boolean isValidDataType(int type) {
-        return type == CLEAR_DOWNLOADS;
+        // TODO(samartnik): disabling option as it requires futher research
+        // At the moment causes issue https://github.com/brave/brave-browser/issues/8737
+        // return type == CLEAR_DOWNLOADS;
+        return false;
     }
 
     static @BrowsingDataType int getDataType(int type) {

diff --git a/android/java/res/xml/clear_browsing_data_preferences_tab.xml b/android/java/res/xml/clear_browsing_data_preferences_tab.xml
@@ -31,10 +31,12 @@
         android:persistent="false"
         android:title="@string/clear_cache_title" />
 
-    <org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
+    <!-- TODO(samartnik): disabling option as it requires futher research
+         At the moment causes issue https://github.com/brave/brave-browser/issues/8737 -->
+    <!-- <org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
         android:key="clear_downloads_checkbox"
         android:persistent="false"
-        android:title="@string/clear_downloads_title" />
+        android:title="@string/clear_downloads_title" /> -->
 
     <org.chromium.chrome.browser.settings.ClearBrowsingDataCheckBoxPreference
         android:key="clear_passwords_checkbox"