Merge remote-tracking branch 'origin/release/20.04'

src/kmmainwidget.h

@@ -523,11 +523,13 @@ private:
     void replyCurrentMessageCommand(MessageComposer::ReplyStrategy strategy);
     void setupUnifiedMailboxChecker();
     QAction *filterToAction(MailCommon::MailFilter *filter);
-    Akonadi::Collection::List applyFilterOnCollection(bool recursive);
+    Q_REQUIRED_RESULT Akonadi::Collection::List applyFilterOnCollection(bool recursive);
     void setShowStatusBarMessage(const QString &msg);
     void slotRestartAccount();
     void slotAccountSettings();
     void updateDisplayFormatMessage();
+    void slotContactHtmlPreferencesUpdated(const Akonadi::Item &contact, Akonadi::Item::Id id, bool showAsHTML, bool remoteContent);
+
 
     // Message actions
     QAction *mDeleteAction = nullptr;

src/kmreaderwin.cpp

@@ -836,12 +836,22 @@ void KMReaderWin::slotContactHtmlOptions()
     const QString emailString = KEmailAddress::decodeMailtoUrl(url).toLower();
 
     KPIM::AddEmailDisplayJob *job = new KPIM::AddEmailDisplayJob(emailString, mMainWindow, this);
+    job->setMessageId(mViewer->messageItem().id());
+    connect(job, &KPIM::AddEmailDisplayJob::contactUpdated, this, &KMReaderWin::slotContactHtmlPreferencesUpdated);
     job->setRemoteContent(mLoadExternalReference->isChecked());
     job->setShowAsHTML(mViewAsHtml->isChecked());
     job->setContact(mSearchedContact);
     job->start();
 }
 
+void KMReaderWin::slotContactHtmlPreferencesUpdated(const Akonadi::Item &contact, Akonadi::Item::Id id, bool showAsHTML, bool remoteContent)
+{
+    Q_UNUSED(contact)
+    if (mViewer->messageItem().id() == id) {
+        mViewer->slotChangeDisplayMail(showAsHTML ? Viewer::Html : Viewer::Text, remoteContent);
+    }
+}
+
 void KMReaderWin::slotEditContact()
 {
     if (mSearchedContact.isValid()) {

src/kmreaderwin.h

@@ -220,12 +220,13 @@ public Q_SLOTS:
     void slotPrintingFinished();
 
 protected:
-    QUrl urlClicked() const;
-    QUrl imageUrlClicked() const;
+    Q_REQUIRED_RESULT QUrl urlClicked() const;
+    Q_REQUIRED_RESULT QUrl imageUrlClicked() const;
 
 private:
     void createActions();
     void updateHtmlActions();
+    void slotContactHtmlPreferencesUpdated(const Akonadi::Item &contact, Akonadi::Item::Id id, bool showAsHTML, bool remoteContent);
 
 private:
     KContacts::Addressee mSearchedAddress;