Skip to content

Commit

Permalink
Merge pull request #13249 from Snuffleupagus/rm-generic-signature-warn
Browse files Browse the repository at this point in the history
[GENERIC viewer] Don't display the `errorWrapper`, for documents with signatures (PR 13217 follow-up)
timvandermeij authored Apr 16, 2021

Verified

This commit was signed with the committer’s verified signature.
cosmicBboy Niels Bantilan
2 parents 6e8ff2f + a6e29ab commit ad2afab
Showing 3 changed files with 0 additions and 22 deletions.
3 changes: 0 additions & 3 deletions l10n/en-US/viewer.properties
Original file line number Diff line number Diff line change
@@ -246,6 +246,3 @@ password_cancel=Cancel
printing_not_supported=Warning: Printing is not fully supported by this browser.
printing_not_ready=Warning: The PDF is not fully loaded for printing.
web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
# LOCALIZATION NOTE (unsupported_feature_signatures): Should contain the same
# exact string as in the `chrome.properties` file.
unsupported_feature_signatures=This PDF document contains digital signatures. Validation of signatures is not supported.
17 changes: 0 additions & 17 deletions web/app.js
Original file line number Diff line number Diff line change
@@ -1048,30 +1048,13 @@ const PDFViewerApplication = {
featureId,
});

// Don't show the fallback bar for things that are *very* unlikely to cause
// user-visible errors, to avoid bothering the user unnecessarily.
switch (featureId) {
case UNSUPPORTED_FEATURES.errorFontLoadNative:
case UNSUPPORTED_FEATURES.errorFontMissing:
return;
}
// Only trigger the fallback once so we don't spam the user with messages
// for one PDF.
if (this._fellback) {
return;
}
this._fellback = true;

// Ensure that, for signatures, a warning is shown in non-Firefox builds.
if (
(typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) &&
featureId === UNSUPPORTED_FEATURES.signatures
) {
this.l10n.get("unsupported_feature_signatures").then(msg => {
this._otherError(msg);
});
}

this.externalServices
.fallback({
featureId,
2 changes: 0 additions & 2 deletions web/l10n_utils.js
Original file line number Diff line number Diff line change
@@ -81,8 +81,6 @@ const DEFAULT_L10N_STRINGS = {
printing_not_ready: "Warning: The PDF is not fully loaded for printing.",
web_fonts_disabled:
"Web fonts are disabled: unable to use embedded PDF fonts.",
unsupported_feature_signatures:
"This PDF document contains digital signatures. Validation of signatures is not supported.",
};

function getL10nFallback(key, args) {

0 comments on commit ad2afab

Please sign in to comment.