From 297c305150354d575978b9d211709b6eb89377ac Mon Sep 17 00:00:00 2001
From: Jakob Miland <saebekassebil@gmail.com>
Date: Sun, 7 Apr 2013 17:26:35 +0200
Subject: [PATCH] Ask for password on failed decryption

---
 l10n/da/viewer.properties    | 1 +
 l10n/en-US/viewer.properties | 1 +
 web/viewer.js                | 9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/l10n/da/viewer.properties b/l10n/da/viewer.properties
index c710189ace90a..b419caf01e44b 100644
--- a/l10n/da/viewer.properties
+++ b/l10n/da/viewer.properties
@@ -103,5 +103,6 @@ loading_error=Der skete en fejl under indlæsningen af PDF-filen
 # Nogle almindelige typer er f.eks.: "Check", "Text", "Comment" og "Note"
 text_annotation_type=[{{type}} Kommentar]
 request_password=PDF filen er beskyttet med et kodeord:
+invalid_password=Ugyldigt kodeord.
 
 printing_not_supported=Advarsel: Denne browser er ikke fuldt understøttet ved udskrift
diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index 99f4ff3053641..06e68864f8440 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -119,6 +119,7 @@ missing_file_error=Missing PDF file.
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Annotation]
 request_password=PDF is protected by a password:
+invalid_password=Invalid Password.
 
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
diff --git a/web/viewer.js b/web/viewer.js
index cd55bf3045afc..0751d43f6420f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1008,9 +1008,16 @@ var PDFView = {
       },
       function getDocumentError(message, exception) {
         if (exception && exception.name === 'PasswordException') {
-          if (exception.code === 'needpassword') {
+          if (exception.code === 'needpassword' ||
+              exception.code === 'incorrectpassword') {
             var promptString = mozL10n.get('request_password', null,
                                       'PDF is protected by a password:');
+
+            if (exception.code === 'incorrectpassword') {
+              promptString += '\n' + mozL10n.get('invalid_password', null,
+                                      'Invalid Password.');
+            }
+
             password = prompt(promptString);
             if (password && password.length > 0) {
               return PDFView.open(url, scale, password);