From 873608601b2f097a7ab4e3126388086746cbbd4d Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 20 Mar 2020 07:41:53 -0400 Subject: [PATCH] Temporarily deleted clean up downloads option --- ...eClearBrowsingDataPreferencesAdvanced.java | 33 +++++++++++-------- .../clear_browsing_data_preferences_tab.xml | 6 ++-- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java b/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java index 7c2daaea660..21dcb74816a 100644 --- a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java +++ b/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java @@ -19,22 +19,29 @@ import java.util.Set; public class BraveClearBrowsingDataPreferencesAdvanced extends ClearBrowsingDataPreferencesAdvanced { private static final int CLEAR_DOWNLOADS = DialogOption.NUM_ENTRIES; - @Override - protected List 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 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 getAllOptions() { - Set 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 getAllOptions() { + // Set 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 index 0271033d279..37f30c74d30 100644 --- 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" /> - +