Format name only when SN ang GN are available

WE2-738

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

src/controller/command-handlers/certificatereader.cpp

@@ -51,10 +51,11 @@ CardCertificateAndPinInfo getCertificateWithStatusAndInfo(const CardInfo::ptr& c
     auto serialNumber = certificate.subjectInfo(QSslCertificate::SerialNumber).join(' ');
 
     // http://www.etsi.org/deliver/etsi_en/319400_319499/31941201/01.01.01_60/en_31941201v010101p.pdf
-    if(serialNumber.size() > 6 && serialNumber.startsWith(QStringLiteral("PNO")) && serialNumber[5] == '-')
+    if (serialNumber.size() > 6 && serialNumber.startsWith(QStringLiteral("PNO"))
+        && serialNumber[5] == '-')
         serialNumber.remove(0, 6);
 
-    if (!givenName.isEmpty() || !surName.isEmpty()) {
+    if (!givenName.isEmpty() && !surName.isEmpty() && !serialNumber.isEmpty()) {
         subject = QStringLiteral("%1, %2, %3").arg(surName, givenName, serialNumber);
     }