Separate state of basic and advanced tab in CBD dialog

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences.privacy;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.support.annotation.Nullable;
 import android.widget.ListView;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataPreferenceType;
 import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.preferences.ButtonPreference;
 import org.chromium.chrome.browser.preferences.ClearBrowsingDataCheckBoxPreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.SpinnerPreference;
 import org.chromium.chrome.browser.preferences.TextMessageWithLinkAndIconPreference;
 import org.chromium.chrome.browser.preferences.privacy.BrowsingDataCounterBridge.BrowsingDataCounterCallback;
 import org.chromium.chrome.browser.profiles.Profile;
@@ skipping 27 matching lines @@
 
         public Item(ClearBrowsingDataPreferences parent,
                     DialogOption option,
                     ClearBrowsingDataCheckBoxPreference checkbox,
                     boolean selected,
                     boolean enabled) {
             super();
             mParent = parent;
             mOption = option;
             mCheckbox = checkbox;
-            mCounter = new BrowsingDataCounterBridge(this, mOption.getDataType());
+            mCounter = new BrowsingDataCounterBridge(
+                    this, mOption.getDataType(), mParent.getPreferenceType());
 
             mCheckbox.setOnPreferenceClickListener(this);
             mCheckbox.setEnabled(enabled);
             mCheckbox.setChecked(selected);
 
             if (!ClearBrowsingDataTabsFragment.isFeatureEnabled()) {
                 // No summary when unchecked. The redesigned basic and advanced
                 // CBD views will always show the checkbox summary.
                 mCheckbox.setSummaryOff("");
             }
@@ skipping 11 matching lines @@
             return mCheckbox.isChecked();
         }
 
         @Override
         public boolean onPreferenceClick(Preference preference) {
             assert mCheckbox == preference;
 
             mParent.updateButtonState();
             mShouldAnnounceCounterResult = true;
             PrefServiceBridge.getInstance().setBrowsingDataDeletionPreference(
-                    mOption.getDataType(), mCheckbox.isChecked());
+                    mOption.getDataType(), mParent.getPreferenceType(), mCheckbox.isChecked());
             return true;
         }
 
         @Override
         public void onCounterFinished(String result) {
             mCheckbox.setSummaryOn(result);
             if (ClearBrowsingDataTabsFragment.isFeatureEnabled()) {
                 mCheckbox.setSummaryOff(result);
             }
             if (mShouldAnnounceCounterResult) {
@@ skipping 180 matching lines @@
         return new DialogOption[] {
                 DialogOption.CLEAR_HISTORY,
                 DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
                 DialogOption.CLEAR_CACHE,
                 DialogOption.CLEAR_PASSWORDS,
                 DialogOption.CLEAR_FORM_DATA
         };
     }
 
     /**
+     * Returns whether this preference page is a basic or advanced tab in order to use separate

[msramek, 2017/02/08 10:55:55]

// This method returns 1 or 2.
int method() { return 0; }

:-)

[dullweber, 2017/02/08 23:03:18]

ahh right, that's stupid :D Should be solved now, that there is no default value
anymore.

+     * preferences.
+     */
+    protected int getPreferenceType() {
+        return ClearBrowsingDataPreferenceType.DEFAULT;
+    }
+
+    /**
      * Returns the Array of time periods. Options are displayed in the same order as they appear
      * in the array.
      */
     private TimePeriodSpinnerOption[] getTimePeriodSpinnerOptions() {
         Activity activity = getActivity();
 
         TimePeriodSpinnerOption[] options = new TimePeriodSpinnerOption[] {
                 new TimePeriodSpinnerOption(TimePeriod.LAST_HOUR,
                         activity.getString(R.string.clear_browsing_data_period_hour)),
                 new TimePeriodSpinnerOption(TimePeriod.LAST_DAY,
                         activity.getString(R.string.clear_browsing_data_period_day)),
                 new TimePeriodSpinnerOption(TimePeriod.LAST_WEEK,
                         activity.getString(R.string.clear_browsing_data_period_week)),
                 new TimePeriodSpinnerOption(TimePeriod.FOUR_WEEKS,
                         activity.getString(R.string.clear_browsing_data_period_four_weeks)),
                 new TimePeriodSpinnerOption(TimePeriod.ALL_TIME,
                         activity.getString(R.string.clear_browsing_data_period_everything))};
 
         return options;
     }
 
     /**
      * Decides whether a given dialog option should be selected when the dialog is initialized.
      *
      * @param option The option in question.
      * @return boolean Whether the given option should be preselected.
      */
     private boolean isOptionSelectedByDefault(DialogOption option) {
         return PrefServiceBridge.getInstance().getBrowsingDataDeletionPreference(
-                option.getDataType());
+                option.getDataType(), getPreferenceType());
     }
 
     /**
      * Called when clearing browsing data completes.
      * Implements the ChromePreferences.OnClearBrowsingDataListener interface.
      */
     @Override
     public void onBrowsingDataCleared() {
         if (getActivity() == null) return;
 
@@ skipping 67 matching lines @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object value) {
         if (preference.getKey().equals(PREF_TIME_RANGE)) {
             // Inform the items that a recalculation is going to happen as a result of the time
             // period change.
             for (Item item : mItems) {
                 item.setShouldAnnounceCounterResult(false);
             }
 
             PrefServiceBridge.getInstance().setBrowsingDataDeletionTimePeriod(
-                    ((TimePeriodSpinnerOption) value).getTimePeriod());
+                    getPreferenceType(), ((TimePeriodSpinnerOption) value).getTimePeriod());
             return true;
         }
         return false;
     }
 
     /**
      * Disable the "Clear" button if none of the options are selected. Otherwise, enable it.
      */
     protected void updateButtonState() {
         ButtonPreference clearButton = (ButtonPreference) findPreference(PREF_CLEAR_BUTTON);
@@ skipping 20 matching lines @@
         DialogOption[] options = getDialogOptions();
         mItems = new Item[options.length];
         for (int i = 0; i < options.length; i++) {
             boolean enabled = true;
 
             // It is possible to disable the deletion of browsing history.
             if (options[i] == DialogOption.CLEAR_HISTORY
                     && !PrefServiceBridge.getInstance().canDeleteBrowsingHistory()) {
                 enabled = false;
                 PrefServiceBridge.getInstance().setBrowsingDataDeletionPreference(
-                        DialogOption.CLEAR_HISTORY.getDataType(), false);
+                        DialogOption.CLEAR_HISTORY.getDataType(),
+                        ClearBrowsingDataPreferenceType.DEFAULT, false);
             }
 
             mItems[i] = new Item(
                 this,
                 options[i],
                 (ClearBrowsingDataCheckBoxPreference) findPreference(options[i].getPreferenceKey()),
                 isOptionSelectedByDefault(options[i]),
                 enabled);
         }
 
         // Not all checkboxes defined in the layout are necessarily handled by this class
         // or a particular subclass. Hide those that are not.
         EnumSet<DialogOption> unboundOptions = EnumSet.allOf(DialogOption.class);
         unboundOptions.removeAll(Arrays.asList(getDialogOptions()));
         for (DialogOption option : unboundOptions) {
             getPreferenceScreen().removePreference(findPreference(option.getPreferenceKey()));
         }
 
         // The time range selection spinner.
         SpinnerPreference spinner = (SpinnerPreference) findPreference(PREF_TIME_RANGE);
         spinner.setOnPreferenceChangeListener(this);
         TimePeriodSpinnerOption[] spinnerOptions = getTimePeriodSpinnerOptions();
-        int selectedTimePeriod =
-                PrefServiceBridge.getInstance().getBrowsingDataDeletionTimePeriod();
+        int selectedTimePeriod = PrefServiceBridge.getInstance().getBrowsingDataDeletionTimePeriod(
+                getPreferenceType());
         int spinnerOptionIndex = -1;
         for (int i = 0; i < spinnerOptions.length; ++i) {
             if (spinnerOptions[i].getTimePeriod() == selectedTimePeriod) {
                 spinnerOptionIndex = i;
                 break;
             }
         }
         assert spinnerOptionIndex != -1;
         spinner.setOptions(spinnerOptions, spinnerOptionIndex);
 
@@ skipping 180 matching lines @@
                         "History.ClearBrowsingData.ImportantIgnoredPercent",
                         ignoredDomains.length * IMPORTANT_SITES_PERCENTAGE_BUCKET_COUNT
                                 / mSortedImportantDomains.length,
                         IMPORTANT_SITES_PERCENTAGE_BUCKET_COUNT + 1);
             }
             clearBrowsingData(getSelectedOptions(), deselectedDomains, deselectedDomainReasons,
                     ignoredDomains, ignoredDomainReasons);
         }
     }
 }