Changeset 27

Timestamp:

04/11/06 12:15:53 (3 years ago)

Author:

jordi

Message:

The user can now open an encrypted pdf file, as the presenter will ask for the password three time before to show an error, or until the user gives the cancels out.

Location:

trunk

Files:

• src/IMainView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (2 diffs)
• tests/DumbDocument.cxx (modified) (3 diffs)
• tests/DumbDocument.h (modified) (1 diff)
• tests/DumbMainView.cxx (modified) (6 diffs)
• tests/DumbMainView.h (modified) (5 diffs)
• tests/MainPterTest.cxx (modified) (1 diff)
• tests/MainPterTest.h (modified) (2 diffs)

trunk/src/IMainView.h

@@ -29 +29 @@
         public:
             virtual ~IMainView () {}
-
+            
             virtual gchar *openFileDialog () = 0;
+            virtual gchar *promptPasswordDialog () = 0;
             virtual void sensitiveGoToFirstPage (gboolean sensitive) = 0;
             virtual void sensitiveGoToLastPage (gboolean sensitive) = 0;

trunk/src/MainPter.cxx

@@ -153 +153 @@
             // state.
             setInitialState ();
-            g_free (fileName);
         }
         else
-        {
+        {            
             // We got an error, but also can be that the file is encrypted.
             if ( DocumentErrorEncrypted == error->code )
             {
-                // TODO
+                // Now we got an encrypted file.
+                // Prompt for the password up to three time, until the password
+                // is correct or the user cancels the password dialog.
+                int passwordTries = 0;
+                gchar *password = NULL;
+                gboolean loaded = FALSE;
+                do 
+                {
+                    g_free (password);
+                    password = getView ().promptPasswordDialog ();
+                    loaded = m_Document->loadFile (fileName, password, NULL);
+                } while ( 3 > ++passwordTries && 
+                          NULL != password && 
+                          !loaded);
+
+                // We are go, just check if we could load it or show the
+                // error.
+                if ( loaded )
+                {
+                    // Phew, finally loaded. Set the initial state.
+                    setInitialState ();
+                }
+                else if ( NULL != password )
+                {
+                    // We didn't get the correct password, but the user
+                    // tried, because the password is not NULL.
+                    getView ().showErrorMessage (_("Error Loading File"),
+                            _("The password you have supplier is not a"
+                              "valid password for this file."));
+                    g_free (password);
+                }
             }
             else
@@ -171 +200 @@
             g_free (error);
         }
+        g_free (fileName);
     }
 }

trunk/tests/DumbDocument.cxx

@@ -30 +30 @@
     m_Loaded = FALSE;
     m_OpenError = DocumentErrorNone;
+    m_Password = NULL;
 }
 
 DumbDocument::~DumbDocument ()
 {
+    g_free (m_Password);
 }
 
@@ -47 +49 @@
 {
     if ( DocumentErrorNone == m_OpenError )
+    {
+        setFileName (filename);
+        m_Loaded = TRUE;
+    }
+    else if ( DocumentErrorEncrypted == m_OpenError &&
+              password != NULL && 
+              0 == g_ascii_strcasecmp (password, m_Password))
     {
         setFileName (filename);
@@ -80 +89 @@
     m_OpenError = error;
 }
+
+void
+DumbDocument::setPassword (const gchar *password)
+{
+    g_free (m_Password);
+    m_Password = g_strdup (password);
+}

trunk/tests/DumbDocument.h

@@ -36 +36 @@
             // Test functions.
             void setOpenError (DocumentError error);
+            void setPassword (const gchar *password);
 
         private:
             gboolean m_Loaded;
             DocumentError m_OpenError;
+            gchar *m_Password;
     };
 }

trunk/tests/DumbMainView.cxx

@@ -30 +30 @@
     m_DocumentPage = NULL;
     m_OpenFileName = g_strdup ("");
+    m_Password = NULL;
     m_SensitiveGoToFirstPage = TRUE;
     m_SensitiveGoToLastPage = TRUE;
@@ -42 +43 @@
     m_ShownError = FALSE;
     m_Title = g_strdup ("");
+    m_TimesShownPassword = 0;
 }
 
@@ -47 +49 @@
 {
     g_free (m_OpenFileName);
+    g_free (m_Password);
     g_free (m_Title);
 }
@@ -56 +59 @@
 }
 
+gchar *
+DumbMainView::promptPasswordDialog (void)
+{
+    m_TimesShownPassword++;
+    return g_strdup (m_Password);
+}
+
 void
 DumbMainView::sensitiveGoToFirstPage (gboolean sensitive)
@@ -139 +149 @@
 // Test Methods
 ////////////////////////////////////////////////////////////////
+
+gint
+DumbMainView::countTimesShownPasswordPrompt ()
+{
+    return m_TimesShownPassword;
+}
 
 gboolean
@@ -220 +236 @@
 {
     g_free (m_OpenFileName);
-    m_OpenFileName = NULL;
-    if ( NULL != fileName )
-    {
-        m_OpenFileName = g_strdup (fileName);
-    }
+    m_OpenFileName = g_strdup (fileName);
+}
+
+void
+DumbMainView::setPassword (const gchar *password)
+{
+    g_free (m_Password);
+    m_Password = g_strdup (password);
+    m_TimesShownPassword = 0;
 }
 

trunk/tests/DumbMainView.h

@@ -29 +29 @@
 
             gchar *openFileDialog (void);
+            gchar *promptPasswordDialog (void);
             void sensitiveGoToFirstPage (gboolean sensitive);
             void sensitiveGoToLastPage (gboolean sensitive);
@@ -44 +45 @@
 
             // Methods for test purposes.
+            gint countTimesShownPasswordPrompt ();
             const gchar *getTitle (void);
             gboolean hasImagePageView (void);
@@ -57 +59 @@
             gboolean isSensitiveZoomWidth (void);
             void setOpenFileName (const gchar *fileName);
+            void setPassword (const gchar *password);
             gboolean shownError (void);
 
@@ -62 +65 @@
             DocumentPage *m_DocumentPage;
             gchar *m_OpenFileName;
+            gchar *m_Password;
             gboolean m_SensitiveGoToFirstPage;
             gboolean m_SensitiveGoToLastPage;
@@ -73 +77 @@
             gboolean m_Shown;
             gboolean m_ShownError;
+            gint m_TimesShownPassword;
             gchar *m_Title;
     };

trunk/tests/MainPterTest.cxx

@@ -170 +170 @@
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
     CPPUNIT_ASSERT (m_View->shownError ());
-
-}
+}
+
+///
+/// @brief Test a cancelled password.
+///
+/// A cancelled password is more or less the same as cancelling the loading
+/// of a file. It's when the user tried to open an encrypted file, but when 
+/// the password is prompted, then it cancels :-)
+/// It should happen the same as when cancelling the open file dialog.
+///
+void
+MainPterTest::cancelledPassword ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_View->setPassword (NULL);
+    m_Document->setOpenError (DocumentErrorEncrypted);
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomFit ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomWidth ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->shownError ());
+}
+
+///
+/// @brief Test a bad password.
+///
+/// This test is very similar to the previous, but this time the user
+/// enters a bad password, trying to guess which is the correct password.
+/// The presenter gives up after three times and shows an error message.
+///
+void
+MainPterTest::badPassword ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_View->setPassword ("badpassword");
+    m_Document->setPassword ("goodpassword");
+    m_Document->setOpenError (DocumentErrorEncrypted);
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("PDF Viewer", m_View->getTitle ()));
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToFirstPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToLastPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToNextPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomFit ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomWidth ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (m_View->shownError ());
+    CPPUNIT_ASSERT_EQUAL (3, m_View->countTimesShownPasswordPrompt ());
+}

trunk/tests/MainPterTest.h

@@ -30 +30 @@
         CPPUNIT_TEST (loadCancelled);
         CPPUNIT_TEST (loadFailed);
+        CPPUNIT_TEST (cancelledPassword);
+        CPPUNIT_TEST (badPassword);
         CPPUNIT_TEST_SUITE_END();
 
@@ -40 +42 @@
             void loadCancelled (void);
             void loadFailed (void);
-
+            void cancelledPassword (void);
+            void badPassword (void);
         private:
             DumbMainView *m_View;