Changeset 65

Timestamp:

04/14/06 16:24:42 (2 years ago)

Author:

jordi

Message:

The Main presenter now can reload encrypted files without bothering the user about password, unless the document's password has been changed. In this case, it will behaviour like opening the file as new.

Location:

trunk

Files:

• src/IDocument.cxx (modified) (3 diffs)
• src/IDocument.h (modified) (2 diffs)
• src/MainPter.cxx (modified) (6 diffs)
• src/MainPter.h (modified) (1 diff)
• src/PDFDocument.cxx (modified) (1 diff)
• tests/DumbDocument.cxx (modified) (5 diffs)
• tests/DumbDocument.h (modified) (1 diff)
• tests/MainPterTest.cxx (modified) (4 diffs)
• tests/MainPterTest.h (modified) (2 diffs)
• tests/PDFDocumentTest.cxx (modified) (1 diff)

trunk/src/IDocument.cxx

@@ -136 +136 @@
     m_PageMode = PageModeUnset;
     m_PageNumber = 0;
+    m_Password = NULL;
     m_Producer = NULL;
     m_Rotation = 0;
@@ -156 +157 @@
     g_free (m_Keywords);
     g_free (m_ModifiedDate);
+    g_free (m_Password);
     g_free (m_Producer);
     g_free (m_Subject);
@@ -504 +506 @@
 
 ///
-/// @brief Set the document's number of pages.
+/// @brief Gets the password used to open the document.
+///
+/// @return The password used to open the document, or NULL
+///         if no password was used.
+///
+const gchar *
+IDocument::getPassword ()
+{
+    return m_Password;
+}
+
+///
+/// @brief Sets the password user to open the document.
+///
+/// @param password The password used.
+///
+void
+IDocument::setPassword (const gchar *password)
+{
+    gchar *oldPassword = m_Password;
+    m_Password = g_strdup (password);
+    g_free (oldPassword);
+}
+
+///
+/// @brief Sets the document's number of pages.
 ///
 /// @param numPages The number of pages the document has.

trunk/src/IDocument.h

@@ -180 +180 @@
             const gchar *getCreator (void);
             void setCreator (const gchar *creator);
+            const gchar *getPassword (void);
+            void setPassword (const gchar *password);
             const gchar *getProducer (void);
             void setProducer (const gchar *producer);
@@ -242 +244 @@
             PageMode m_PageMode;
             gint m_PageNumber;
+            gchar *m_Password;
             gchar *m_Producer;
             gint m_Rotation;

trunk/src/MainPter.cxx

@@ -245 +245 @@
     IMainView &view = getView ();
     gchar *fileName = view.openFileDialog ();
-    openDocument (fileName, TRUE);
+    openDocument (fileName, NULL, TRUE);
     g_free (fileName);
 }
@@ -263 +263 @@
     gdouble currentZoom = m_Document->getZoom ();
     // Reopen the document.
-    openDocument (m_Document->getFileName (), FALSE);    
+    openDocument (m_Document->getFileName (), m_Document->getPassword (), 
+                  FALSE); 
     // And restore the state
     m_Document->setZoom (currentZoom);
@@ -359 +360 @@
 ///                 NULL then that means the user didn't wanted to
 ///                 open a file, so this function won't do anything.
+/// @param oldPassword This is only used when reloading. It is the last
+///                    password that was used to open a file, and will be
+///                    used to open the file the first try before asking
+///                    to the user. For opening a new file, just set to NULL.
 /// @param canShowPage Set to TRUE if the application should show the page 
 ///                    after the loading or not. This is useful when reloading
@@ -365 +370 @@
 ///
 void
-MainPter::openDocument (const gchar *fileName, gboolean canShowPage)
+MainPter::openDocument (const gchar *fileName, const gchar *oldPassword,
+                        gboolean canShowPage)
 {
     // if fileName is NULL, then the user cancelled the operation.
@@ -372 +378 @@
     if ( NULL != fileName )
     {
-        GError *error = NULL;
-        if ( m_Document->loadFile (fileName, NULL, &error) )
+        GError *error = NULL;        
+        if ( m_Document->loadFile (fileName, oldPassword, &error) )
         {
             // Now that the document has been loaded, just reset the initial
@@ -380 +386 @@
         }
         else
-        {            
+        {
             // We got an error, but also can be that the file is encrypted.
             if ( DocumentErrorEncrypted == error->code )

trunk/src/MainPter.h

@@ -60 +60 @@
 
         protected:
-            void openDocument (const gchar *fileName, gboolean canShowPage);
+            void openDocument (const gchar *fileName, const gchar *oldPassword,
+                               gboolean canShowPage);
             void showPage (void);
 

trunk/src/PDFDocument.cxx

@@ -125 +125 @@
    
     setFileName (filename);
+    setPassword (password);
     delete m_Document;
     m_Document = newDocument;

trunk/tests/DumbDocument.cxx

@@ -30 +30 @@
     m_Loaded = FALSE;
     m_OpenError = DocumentErrorNone;
-    m_Password = NULL;
+    m_TestPassword = NULL; 
     setNumPages (2);
 }
@@ -36 +36 @@
 DumbDocument::~DumbDocument ()
 {
-    g_free (m_Password);
+    g_free (m_TestPassword);
 }
 
@@ -51 +51 @@
     if ( DocumentErrorNone == m_OpenError )
     {
+        m_Loaded = TRUE;
         setFileName (filename);
-        m_Loaded = TRUE;
+        setPassword (password);
     }
     else if ( DocumentErrorEncrypted == m_OpenError &&
-              password != NULL && 
-              0 == g_ascii_strcasecmp (password, m_Password))
+              NULL != password && NULL != m_TestPassword &&
+              0 == g_ascii_strcasecmp (password, m_TestPassword))
     {
+        m_Loaded = TRUE;
         setFileName (filename);
-        m_Loaded = TRUE;
+        setPassword (password);
     }
     else
@@ -65 +67 @@
         g_set_error (error, EPDFVIEW_DOCUMENT_ERROR, m_OpenError, 
                      "%s", IDocument::getErrorMessage (m_OpenError));
+        m_Loaded = FALSE;
     }
     setRotation (0);
@@ -102 +105 @@
 
 void
-DumbDocument::setPassword (const gchar *password)
+DumbDocument::setTestPassword (const gchar *password)
 {
-    g_free (m_Password);
-    m_Password = g_strdup (password);
+    gchar *oldPassword = m_TestPassword;
+    m_TestPassword = g_strdup (password);
+    g_free (oldPassword);
 }

trunk/tests/DumbDocument.h

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

trunk/tests/MainPterTest.cxx

@@ -233 +233 @@
     m_View->setOpenFileName ("/tmp/test.pdf");
     m_View->setPassword ("badpassword");
-    m_Document->setPassword ("goodpassword");
+    m_Document->setTestPassword ("goodpassword");
     m_Document->setOpenError (DocumentErrorEncrypted);
     m_MainPter->openFileActivated ();
@@ -266 +266 @@
     m_View->setOpenFileName ("/tmp/test.pdf");
     m_View->setPassword ("goodpassword");
-    m_Document->setPassword ("goodpassword");
+    m_Document->setTestPassword ("goodpassword");
     m_Document->setOpenError (DocumentErrorEncrypted);
     m_MainPter->openFileActivated ();
@@ -566 +566 @@
     CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
 
     // Reload the document.
@@ -576 +575 @@
     CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-}
+}
+
+///
+/// @brief Tries to reload an encrypted file.
+///
+/// Reloading an encrypted file won't ask for the password unless it changed, 
+/// but here we assume that don't
+///
+void
+MainPterTest::reloadEncrypted ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_View->setPassword ("goodpassword");
+    m_Document->setTestPassword ("goodpassword");
+    m_Document->setOpenError (DocumentErrorEncrypted);
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
+    
+    m_MainPter->goToNextPageActivated ();
+    m_MainPter->rotateRightActivated (); 
+    m_MainPter->zoomWidthActivated ();
+    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ()); 
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+
+    // Reload the document.
+    m_View->setPassword ("badpassword");
+    m_Document->setTestPassword ("goodpassword");
+    m_Document->setOpenError (DocumentErrorEncrypted);
+    m_MainPter->reloadActivated ();
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
+    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ()); 
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->shownError ());
+    CPPUNIT_ASSERT_EQUAL (0, m_View->countTimesShownPasswordPrompt ());
+}
+
+///
+/// @brief Tries to reload an encrypted file whose password changed.
+///
+/// Reloading an encrypted file won't ask for the password unless it changed. 
+///
+void
+MainPterTest::reloadChangedPassword ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_View->setPassword ("goodpassword");
+    m_Document->setTestPassword ("goodpassword");
+    m_Document->setOpenError (DocumentErrorEncrypted);
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
+    
+    m_MainPter->goToNextPageActivated ();
+    m_MainPter->rotateRightActivated (); 
+    m_MainPter->zoomWidthActivated ();
+    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ()); 
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+
+    // Reload the document.
+    m_View->setPassword ("newpassword");
+    m_Document->setTestPassword ("newpassword");
+    CPPUNIT_ASSERT_EQUAL (0,
+            g_ascii_strcasecmp("goodpassword", m_Document->getPassword ()));
+    m_Document->setOpenError (DocumentErrorEncrypted);
+    m_MainPter->reloadActivated ();
+    CPPUNIT_ASSERT_EQUAL (0,
+            g_ascii_strcasecmp("newpassword", m_Document->getPassword ()));
+    CPPUNIT_ASSERT_EQUAL (0, 
+            g_ascii_strcasecmp ("/tmp/test.pdf", m_View->getTitle ()));
+    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ()); 
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->shownError ());
+    CPPUNIT_ASSERT_EQUAL (1, m_View->countTimesShownPasswordPrompt ());
+}

trunk/tests/MainPterTest.h

@@ -38 +38 @@
         CPPUNIT_TEST (pageZoom);
         CPPUNIT_TEST (reloadNormal);
+        CPPUNIT_TEST (reloadEncrypted);
+        CPPUNIT_TEST (reloadChangedPassword);
         CPPUNIT_TEST_SUITE_END();
 
@@ -56 +58 @@
             void pageZoom (void);
             void reloadNormal (void);
+            void reloadEncrypted (void);
+            void reloadChangedPassword (void);
 
         private:

trunk/tests/PDFDocumentTest.cxx

@@ -194 +194 @@
             g_ascii_strcasecmp (TEST_DATA_DIR "test_encrypted.pdf", 
                                 m_Document->getFileName ()));
+    CPPUNIT_ASSERT_EQUAL (0, g_ascii_strcasecmp ("testpasswd", 
+                                                 m_Document->getPassword ()));
 }