From 1b35c33a94d4e999284843bf931799b75b51ea2b Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Mon, 24 Apr 2023 17:42:51 +0200
Subject: [PATCH] Move Not Available string away from the early convertion code
 and into ui code

---
 generators/poppler/pdfsettingswidget.cpp | 12 +++++++++++-
 generators/poppler/pdfsignatureutils.cpp |  6 ++----
 part/certificateviewer.cpp               | 20 ++++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/generators/poppler/pdfsettingswidget.cpp b/generators/poppler/pdfsettingswidget.cpp
index 52dcaa1e7..bd7c075b6 100644
--- a/generators/poppler/pdfsettingswidget.cpp
+++ b/generators/poppler/pdfsettingswidget.cpp
@@ -19,6 +19,14 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 
+static QString notAvailableIfEmpty(const QString &string)
+{
+    if (string.isEmpty()) {
+        return i18n("Not Available");
+    }
+    return string;
+}
+
 PDFSettingsWidget::PDFSettingsWidget(QWidget *parent)
     : QWidget(parent)
 {
@@ -76,7 +84,9 @@ bool PDFSettingsWidget::event(QEvent *e)
 
         for (auto cert : certs) {
             new QTreeWidgetItem(m_tree,
-                                {cert->subjectInfo(Okular::CertificateInfo::EntityInfoKey::CommonName), cert->subjectInfo(Okular::CertificateInfo::EntityInfoKey::EmailAddress), cert->validityEnd().toString(QStringLiteral("yyyy-MM-dd"))});
+                                {notAvailableIfEmpty(cert->subjectInfo(Okular::CertificateInfo::EntityInfoKey::CommonName)),
+                                 notAvailableIfEmpty(cert->subjectInfo(Okular::CertificateInfo::EntityInfoKey::EmailAddress)),
+                                 cert->validityEnd().toString(QStringLiteral("yyyy-MM-dd"))});
         }
         qDeleteAll(certs);
 
diff --git a/generators/poppler/pdfsignatureutils.cpp b/generators/poppler/pdfsignatureutils.cpp
index e03400f02..dfbf08ef0 100644
--- a/generators/poppler/pdfsignatureutils.cpp
+++ b/generators/poppler/pdfsignatureutils.cpp
@@ -36,14 +36,12 @@ QByteArray PopplerCertificateInfo::serialNumber() const
 
 QString PopplerCertificateInfo::issuerInfo(PopplerCertificateInfo::EntityInfoKey key) const
 {
-    QString str = m_info.issuerInfo(static_cast<Poppler::CertificateInfo::EntityInfoKey>(key));
-    return !str.isEmpty() ? str : i18n("Not Available");
+    return m_info.issuerInfo(static_cast<Poppler::CertificateInfo::EntityInfoKey>(key));
 }
 
 QString PopplerCertificateInfo::subjectInfo(PopplerCertificateInfo::EntityInfoKey key) const
 {
-    QString str = m_info.subjectInfo(static_cast<Poppler::CertificateInfo::EntityInfoKey>(key));
-    return !str.isEmpty() ? str : i18n("Not Available");
+    return m_info.subjectInfo(static_cast<Poppler::CertificateInfo::EntityInfoKey>(key));
 }
 
 QString PopplerCertificateInfo::nickName() const
diff --git a/part/certificateviewer.cpp b/part/certificateviewer.cpp
index 0636f5252..787f96f96 100644
--- a/part/certificateviewer.cpp
+++ b/part/certificateviewer.cpp
@@ -111,6 +111,14 @@ static QString splitDNAttributes(const QString &text)
     return splitDNAttributes(QStringList {text});
 }
 
+static QString notAvailableIfEmpty(const QString &string)
+{
+    if (string.isEmpty()) {
+        return i18n("Not Available");
+    }
+    return string;
+}
+
 CertificateViewer::CertificateViewer(const Okular::CertificateInfo &certInfo, QWidget *parent)
     : KPageDialog(parent)
     , m_certificateInfo(certInfo)
@@ -132,16 +140,16 @@ CertificateViewer::CertificateViewer(const Okular::CertificateInfo &certInfo, QW
     auto issuerBox = new QGroupBox(i18n("Issued By"), generalPage);
     auto issuerFormLayout = new QFormLayout(issuerBox);
     issuerFormLayout->setLabelAlignment(Qt::AlignLeft);
-    issuerFormLayout->addRow(i18n("Common Name(CN)"), new QLabel(m_certificateInfo.issuerInfo(Okular::CertificateInfo::CommonName)));
-    issuerFormLayout->addRow(i18n("EMail"), new QLabel(m_certificateInfo.issuerInfo(Okular::CertificateInfo::EmailAddress)));
-    issuerFormLayout->addRow(i18n("Organization(O)"), new QLabel(m_certificateInfo.issuerInfo(Okular::CertificateInfo::Organization)));
+    issuerFormLayout->addRow(i18n("Common Name(CN)"), new QLabel(notAvailableIfEmpty(m_certificateInfo.issuerInfo(Okular::CertificateInfo::CommonName))));
+    issuerFormLayout->addRow(i18n("EMail"), new QLabel(notAvailableIfEmpty(m_certificateInfo.issuerInfo(Okular::CertificateInfo::EmailAddress))));
+    issuerFormLayout->addRow(i18n("Organization(O)"), new QLabel(notAvailableIfEmpty(m_certificateInfo.issuerInfo(Okular::CertificateInfo::Organization))));
 
     auto subjectBox = new QGroupBox(i18n("Issued To"), generalPage);
     auto subjectFormLayout = new QFormLayout(subjectBox);
     subjectFormLayout->setLabelAlignment(Qt::AlignLeft);
-    subjectFormLayout->addRow(i18n("Common Name(CN)"), new QLabel(m_certificateInfo.subjectInfo(Okular::CertificateInfo::CommonName)));
-    subjectFormLayout->addRow(i18n("EMail"), new QLabel(m_certificateInfo.subjectInfo(Okular::CertificateInfo::EmailAddress)));
-    subjectFormLayout->addRow(i18n("Organization(O)"), new QLabel(m_certificateInfo.subjectInfo(Okular::CertificateInfo::Organization)));
+    subjectFormLayout->addRow(i18n("Common Name(CN)"), new QLabel(notAvailableIfEmpty(m_certificateInfo.subjectInfo(Okular::CertificateInfo::CommonName))));
+    subjectFormLayout->addRow(i18n("EMail"), new QLabel(notAvailableIfEmpty(m_certificateInfo.subjectInfo(Okular::CertificateInfo::EmailAddress))));
+    subjectFormLayout->addRow(i18n("Organization(O)"), new QLabel(notAvailableIfEmpty(m_certificateInfo.subjectInfo(Okular::CertificateInfo::Organization))));
 
     auto validityBox = new QGroupBox(i18n("Validity"), generalPage);
     auto validityFormLayout = new QFormLayout(validityBox);