1437486 - Forget about site no longer clears anything but 5 minute intervals on Nightly

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[:Gijs (he/him)]

Before bug 1167238, the forget button's code looked like this:


>      this._sanitizer.range = this._getSanitizeRange(doc);

      let group = doc.getElementById("PanelUI-panic-timeSpan");
      BrowserUITelemetry.countPanicEvent(group.selectedItem.id);

>      group.selectedItem = doc.getElementById("PanelUI-panic-5min");

      let itemsToClear = [
        "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads"
      ];
      let newWindowPrivateState = PrivateBrowsingUtils.isWindowPrivate(doc.defaultView) ?
                                  "private" : "non-private";
      this._sanitizer.items.openWindows.privateStateForNewWindow = newWindowPrivateState;

>      let promise = this._sanitizer.sanitize(itemsToClear);

Note especially the highlighted lines.

Now it looks like this:

      let group = doc.getElementById("PanelUI-panic-timeSpan");
      BrowserUITelemetry.countPanicEvent(group.selectedItem.id);

>      group.selectedItem = doc.getElementById("PanelUI-panic-5min");

      let itemsToClear = [
        "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads"
      ];
      let newWindowPrivateState = PrivateBrowsingUtils.isWindowPrivate(doc.defaultView) ?
                                  "private" : "non-private";

>      let promise = Sanitizer.sanitize(itemsToClear, {
>        ignoreTimespan: false,
>        range: Sanitizer.getClearRange(+group.value),
>        privateStateForNewWindow: newWindowPrivateState,
>      });


This is clearly wrong, and will lead to us always forgetting only 5 minutes.

Comment 1

[:Gijs (he/him)]

Because I got pinged in bug 1323614 and we can fix both in one go, I'll just put up a patch here.

Comment 2

[:Gijs (he/him)]

Attachment: Bug 1437486 - don't reset the forget button duration when the popup is visible,

Review commit: https://reviewboard.mozilla.org/r/219440/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/219440/

Comment 3

[Johann Hofmann [:johannh]]

Comment on attachment 8950174 [details]
Bug 1437486 - don't reset the forget button duration when the popup is visible,

https://reviewboard.mozilla.org/r/219440/#review225196

Thanks for catching this!

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/30f89b1eab1c
don't reset the forget button duration when the popup is visible, r=johannh

Comment 5

[Cristina Coroiu [:ccoroiu]]

https://hg.mozilla.org/mozilla-central/rev/30f89b1eab1c