From 83405b6616218827113444abd20400f772972058 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Thu, 16 Apr 2026 11:26:57 +0300 Subject: [PATCH] Check if one of givename/surname is available WE2-1210 Signed-off-by: Raul Metsma --- .github/workflows/cmake-linux-fedora.yml | 2 +- .github/workflows/cmake-linux-ubuntu.yml | 2 +- src/controller/command-handlers/certificatereader.cpp | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-linux-fedora.yml b/.github/workflows/cmake-linux-fedora.yml index 8a19c19b..a2f94f59 100644 --- a/.github/workflows/cmake-linux-fedora.yml +++ b/.github/workflows/cmake-linux-fedora.yml @@ -14,7 +14,7 @@ jobs: container: fedora:${{ matrix.container }} strategy: matrix: - container: [42, 43] + container: [42, 43, 44] steps: - name: Install Deps diff --git a/.github/workflows/cmake-linux-ubuntu.yml b/.github/workflows/cmake-linux-ubuntu.yml index 679614ed..1ab8ff07 100644 --- a/.github/workflows/cmake-linux-ubuntu.yml +++ b/.github/workflows/cmake-linux-ubuntu.yml @@ -17,7 +17,7 @@ jobs: container: ubuntu:${{matrix.container}} strategy: matrix: - container: ['22.04', '24.04', '25.04', '25.10'] + container: ['22.04', '24.04', '25.10', '26.04'] arch: ['amd64', 'arm64'] steps: diff --git a/src/controller/command-handlers/certificatereader.cpp b/src/controller/command-handlers/certificatereader.cpp index e377050c..91fbfd55 100644 --- a/src/controller/command-handlers/certificatereader.cpp +++ b/src/controller/command-handlers/certificatereader.cpp @@ -51,11 +51,13 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid // http://www.etsi.org/deliver/etsi_en/319400_319499/31941201/01.01.01_60/en_31941201v010101p.pdf if (serialNumber.size() > 6 && serialNumber.startsWith(QLatin1String("PNO")) - && serialNumber[5] == '-') + && serialNumber[5] == '-') { serialNumber.remove(0, 6); - - if (!givenName.isEmpty() && !surName.isEmpty() && !serialNumber.isEmpty()) { - subject = QStringLiteral("%1, %2, %3").arg(surName, givenName, serialNumber); + } + if ((!givenName.isEmpty() || !surName.isEmpty()) && !serialNumber.isEmpty()) { + QStringList tmp({surName, givenName, serialNumber}); + tmp.removeAll(QString()); + subject = tmp.join(", "); } CertificateInfo certInfo {