#3342 versiondialog: handle writing of encrypted notes

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## 25.8.4
 
-- Allow decrypting of the note text in the version dialog if the note was decrypted
+- Now the version dialog can show decrypted note content if the note was decrypted
   in the note edit panel (for [#3342](https://github.com/pbek/QOwnNotes/issues/3342))
+  - The note text will also be restored correctly, depending on if it was encrypted or not
   - In addition, when doing git versioning with libgit2 support also the diff will be decrypted
 - When viewing note version with enabled libgit2 support, now a message box will be shown
   that there are no versions if there are none (for [#3296](https://github.com/pbek/QOwnNotes/issues/3296))

src/dialogs/versiondialog.cpp

@@ -48,29 +48,14 @@ VersionDialog::VersionDialog(const QJSValue &versions, QWidget *parent)
     QString itemName;
     QString diffHtml;
     ui->versionListWidget->clear();
-    diffList = new QStringList();
-    dataList = new QStringList();
-    auto currentNote = MainWindow::instance()->getCurrentNote();
+    _diffList = new QStringList();
+    _dataList = new QStringList();
+    const auto currentNote = MainWindow::instance()->getCurrentNote();
     bool canDecryptNoteText = currentNote.canDecryptNoteText();
 
-    qDebug() << __func__
-             << " - 'currentNote.canDecryptNoteText()': " << currentNote.canDecryptNoteText();
-
-    //    if (currentNote.canDecryptNoteText()) {
-    //        const QSignalBlocker blocker(ui->encryptedNoteTextEdit);
-    //        Q_UNUSED(blocker)
-    //
-    //        ui->noteTextEdit->hide();
-    //        const auto text = currentNote.fetchDecryptedNoteText();
-
     // Init the iterator for the versions
     QJSValueIterator versionsIterator(versions);
 
-    // This seems to report a hasNext even if there aren't any items
-    if (!versionsIterator.hasNext()) {
-        return;
-    }
-
     // Iterate over the versions
     while (versionsIterator.hasNext()) {
         versionsIterator.next();
@@ -93,19 +78,21 @@ VersionDialog::VersionDialog(const QJSValue &versions, QWidget *parent)
         diffHtml.replace(QLatin1String("\n"), QLatin1String("<br />"));
 
         ui->versionListWidget->addItem(itemName);
-        diffList->append(diffHtml);
+        _diffList->append(diffHtml);
         QString noteText = versionsIterator.value().property(QStringLiteral("data")).toString();
 
         // Decrypt the note text if possible
         if (canDecryptNoteText) {
             noteText = currentNote.getDecryptedNoteText(Note::parseEncryptedNoteText(noteText));
         }
 
-        dataList->append(noteText);
+        _dataList->append(noteText);
     }
 
-    ui->versionListWidget->setCurrentRow(0);
-    ui->diffBrowser->setHtml(diffList->at(0));
+    if (!_diffList->isEmpty()) {
+        ui->versionListWidget->setCurrentRow(0);
+        ui->diffBrowser->setHtml(_diffList->at(0));
+    }
 }
 
 void VersionDialog::setupMainSplitter() {
@@ -131,16 +118,16 @@ void VersionDialog::storeSettings() {
 VersionDialog::~VersionDialog() { delete ui; }
 
 void VersionDialog::on_versionListWidget_currentRowChanged(int currentRow) {
-    ui->diffBrowser->setHtml(diffList->value(currentRow));
-    ui->noteTextEdit->setPlainText(dataList->value(currentRow));
+    ui->diffBrowser->setHtml(_diffList->value(currentRow));
+    ui->noteTextEdit->setPlainText(_dataList->value(currentRow));
 }
 
 void VersionDialog::dialogButtonClicked(QAbstractButton *button) {
     int actionRole = button->property("ActionRole").toInt();
 
     if (actionRole == Restore) {
         MainWindow::instance()->setCurrentNoteText(
-            dataList->value(ui->versionListWidget->currentRow()));
+            _dataList->value(ui->versionListWidget->currentRow()));
     }
 
     this->close();

src/dialogs/versiondialog.h

@@ -33,8 +33,8 @@ class VersionDialog : public MasterDialog {
 
     Ui::VersionDialog *ui;
     QSplitter *versionSplitter;
-    QStringList *diffList;
-    QStringList *dataList;
+    QStringList *_diffList;
+    QStringList *_dataList;
     void setupMainSplitter();
 };
 

src/mainwindow.cpp

@@ -4599,10 +4599,20 @@ void MainWindow::startNavigationParser() {
  * @brief MainWindow::setCurrentNoteText
  * @param text
  */
-void MainWindow::setCurrentNoteText(QString text) {
+void MainWindow::setCurrentNoteText(const QString &text) {
+    bool canDecryptNoteText = currentNote.canDecryptNoteText();
     allowNoteEditing();
-    currentNote.setNoteText(std::move(text));
-    setNoteTextFromNote(&currentNote, false);
+
+    // If the note can be decrypted, we need to show the encrypted note text edit and set the text
+    // there
+    if (canDecryptNoteText) {
+        ui->encryptedNoteTextEdit->setText(text);
+        ui->encryptedNoteTextEdit->show();
+        ui->noteTextEdit->hide();
+    } else {
+        currentNote.setNoteText(std::move(text));
+        setNoteTextFromNote(&currentNote, false);
+    }
 }
 
 /**

src/mainwindow.h

@@ -122,7 +122,7 @@ class MainWindow : public QMainWindow {
 
     void reloadOpenAiControls();
 
-    void setCurrentNoteText(QString text);
+    void setCurrentNoteText(const QString &text);
 
     void setCurrentNote(Note note, bool updateNoteText = true, bool updateSelectedNote = true,
                         bool addPreviousNoteToHistory = true);