Changeset 55557 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 30, 2015 2:41:21 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Disk Encryption (DE) support: UIMedium should cache the encryption password ID during the enumeration.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMedium.cpp (modified) (3 diffs)
• UIMedium.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

@@ -91 +91 @@
     m_strHardDiskFormat = other.hardDiskFormat();
     m_strStorageDetails = other.storageDetails();
+    m_strEncryptionPasswordID = other.encryptionPasswordID();
 
     m_strUsage = other.usage();
@@ -155 +156 @@
     m_strHardDiskFormat = QString();
     m_strStorageDetails = QString();
+    m_strEncryptionPasswordID = QString();
 
     /* Reset data parameters: */
@@ -245 +247 @@
                 }
 
-                /* Check whether this medium is encrypted: */
+                /* Refresh encryption attributes: */
                 if (m_strRootId != m_strId)
+                {
+                    m_strEncryptionPasswordID = root().encryptionPasswordID();
                     m_fEncrypted = root().isEncrypted();
+                }
                 else
                 {
                     QString strCipher;
                     CMedium medium(m_medium);
-                    medium.GetEncryptionSettings(strCipher);
-                    m_fEncrypted = medium.isOk();
+                    const QString strEncryptionPasswordID = medium.GetEncryptionSettings(strCipher);
+                    if (medium.isOk())
+                    {
+                        m_strEncryptionPasswordID = strEncryptionPasswordID;
+                        m_fEncrypted = true;
+                    }
                 }
             }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h

@@ -193 +193 @@
     /** Returns the hard drive medium storage details. */
     QString storageDetails() const { return m_strStorageDetails; }
+    /** Returns the hard drive medium encryption password ID. */
+    QString encryptionPasswordID() const { return m_strEncryptionPasswordID; }
 
     /** Returns the medium usage data.
@@ -336 +338 @@
     /** Holds the hard drive medium storage details. */
     QString m_strStorageDetails;
+    /** Holds the hard drive medium encryption password ID. */
+    QString m_strEncryptionPasswordID;
 
     /** Holds the medium usage. */