qownnotes/web-companion#57 web-companion: handle disable note edit an…

…d encrypted notes editing

src/mainwindow.cpp

@@ -6678,6 +6678,14 @@ void MainWindow::on_actionDecrypt_note_triggered() {
  * Lets the user edit an encrypted note text in a 2nd text edit
  */
 void MainWindow::on_actionEdit_encrypted_note_triggered() {
+    editEncryptedNote();
+}
+
+void MainWindow::editEncryptedNoteAsync() {
+    QTimer::singleShot(0, this, &MainWindow::editEncryptedNote);
+}
+
+void MainWindow::editEncryptedNote() {
     currentNote.refetch();
     if (!currentNote.hasEncryptedNoteText()) {
         return;

src/mainwindow.h

@@ -155,6 +155,10 @@ class MainWindow : public QMainWindow {
 
     QAction *findAction(const QString &objectName);
 
+    void editEncryptedNote();
+
+    void editEncryptedNoteAsync();
+
     void addCustomAction(const QString &identifier, const QString &menuText,
                          const QString &buttonText, const QString &icon,
                          bool useInNoteEditContextMenu = false, bool hideButtonInToolbar = false,

src/services/websocketserverservice.cpp

@@ -371,14 +371,26 @@ int WebSocketServerService::deleteBookmark(const QJsonObject &jsonObject) {
     // Remove the Markdown text in the current note
     MainWindow *mainWindow = MainWindow::instance();
     if (mainWindow != nullptr) {
+//        auto note = mainWindow->getCurrentNote();
+//        auto textBefore = note.hasEncryptedNoteText() && note.canDecryptNoteText()
+//                           ? note.fetchDecryptedNoteText()
+//                           : note.getNoteText();
         auto textBefore = mainWindow->activeNoteTextEdit()->toPlainText();
         auto textAfter = textBefore;
+        // Remove the bookmark from the note (try "\n" and without "\n")
         textAfter.remove(markdown + QStringLiteral("\n"));
         textAfter.remove(markdown);
 
         if (textBefore != textAfter) {
+//            note.setDecryptedNoteText(textAfter);
+            mainWindow->allowNoteEditing();
             mainWindow->activeNoteTextEdit()->setPlainText(textAfter);
             noteCount++;
+
+            auto note = mainWindow->getCurrentNote();
+            if (note.hasEncryptedNoteText()) {
+                mainWindow->editEncryptedNoteAsync();
+            }
         }
     }