Commit 3b70eeaa authored by valenting's avatar valenting
Browse files

Bug 1816720 - DoH UI warning page: Add continue this time button r=fluent-reviewers,acreskey,flod 

Differential Revision: https://phabricator.services.mozilla.com/D173010
parent b4d9434d

toolkit/actors/NetErrorChild.sys.mjs

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ export class NetErrorChild extends RemotePageChild { 
      "RPMGetTRRSkipReason",

      "RPMGetTRRDomain",

      "RPMIsSiteSpecificTRRError",

      "RPMSetTRRDisabledLoadFlags",

    ];

    this.exportFunctions(exportableFunctions);

  }
@@ -228,4 +229,9 @@ export class NetErrorChild extends RemotePageChild { 
    }

    return false;

  }



  RPMSetTRRDisabledLoadFlags() {

    this.contentWindow.docShell.defaultLoadFlags |=

      Ci.nsIRequest.LOAD_TRR_DISABLED_MODE;

  }

}

toolkit/content/aboutNetError.mjs

+9 −0
Original line number Diff line number Diff line
@@ -520,6 +520,15 @@ function showNativeFallbackWarning() { 
    retryThis(nativeFallbackIgnoreButton);

  });



  let continueThisTimeButton = document.getElementById(

    "nativeFallbackContinueThisTimeButton"

  );

  continueThisTimeButton.addEventListener("click", () => {

    RPMSetTRRDisabledLoadFlags();

    document.location.reload();

  });

  continueThisTimeButton.hidden = false;



  nativeFallbackIgnoreButton.hidden = false;

  let message = document.getElementById("nativeFallbackMessage");

  document.l10n.setAttributes(

toolkit/content/aboutNetError.xhtml

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
        <button class="primary try-again" data-l10n-id="neterror-try-again-button"></button>

        <button id="trrExceptionButton" data-l10n-id="neterror-add-exception-button" hidden=""></button>

        <button id="trrSettingsButton" data-l10n-id="neterror-settings-button" hidden=""></button>

        <button id="nativeFallbackContinueThisTimeButton" data-l10n-id="neterror-trr-continue-this-time" hidden=""></button>

        <button id="nativeFallbackIgnoreButton" data-l10n-id="neterror-disable-native-feedback-warning" hidden=""></button>

      </div>

toolkit/locales/en-US/toolkit/neterror/netError.ftl

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ neterror-try-again-button = Try Again 
neterror-add-exception-button = Always continue for this site

neterror-settings-button = Change DNS settings

neterror-view-certificate-link = View Certificate

neterror-trr-continue-this-time = Continue this time

neterror-disable-native-feedback-warning = Always continue



##

toolkit/modules/RemotePageAccessManager.sys.mjs

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ export let RemotePageAccessManager = { 
      RPMGetTRRSkipReason: ["*"],

      RPMGetTRRDomain: ["*"],

      RPMIsSiteSpecificTRRError: ["*"],

      RPMSetTRRDisabledLoadFlags: ["*"],

      RPMSendQuery: ["Browser:AddTRRExcludedDomain"],

    },

    "about:plugins": {