diff --git a/src/controller/certandpininfo.hpp b/src/controller/certandpininfo.hpp index abeb3aad..166415a9 100644 --- a/src/controller/certandpininfo.hpp +++ b/src/controller/certandpininfo.hpp @@ -36,7 +36,6 @@ struct EidCertificateAndPinInfo QSslCertificate certificate {}; CertificateInfo certInfo; PinInfo pinInfo; - bool pin1Active = true; bool pin2Active = true; }; diff --git a/src/controller/command-handlers/certificatereader.cpp b/src/controller/command-handlers/certificatereader.cpp index e899ff27..2654a688 100644 --- a/src/controller/command-handlers/certificatereader.cpp +++ b/src/controller/command-handlers/certificatereader.cpp @@ -48,12 +48,10 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid info.maxRetry, }, .readerHasPinPad = eid->smartcard().readerHasPinPad()}; - bool pin1Active = true; bool pin2Active = true; if (eid->type() == ElectronicID::EstEID && eid->name() == "EstEIDThales") { auto infoOther = certificateType.isAuthentication() ? eid->signingPinInfo() : eid->authPinInfo(); - pin1Active = certificateType.isAuthentication() ? info.pinActive : infoOther.pinActive; pin2Active = certificateType.isAuthentication() ? infoOther.pinActive : info.pinActive; } @@ -69,7 +67,6 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid .subject = std::move(subject), }, .pinInfo = std::move(pinInfo), - .pin1Active = pin1Active, .pin2Active = pin2Active, }; } diff --git a/src/ui/translations/cs.ts b/src/ui/translations/cs.ts index 958f7566..30014a6c 100644 --- a/src/ui/translations/cs.ts +++ b/src/ui/translations/cs.ts @@ -187,18 +187,6 @@ PIN entry disabled Zadávání PINu je zakázáno - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Autentizace a podepisování pomocí ID karty ještě nejsou možné. Pro použití ID karty je nutné ji aktivovat v samoobslužném portálu Policie a pohraniční stráže. - - - Activate ID-card - Aktivovat ID kartu - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Podepisování pomocí ID karty ještě není možné. Pro podepisování je nutné změnit kód PIN2 v aplikaci DigiDoc4. diff --git a/src/ui/translations/de.ts b/src/ui/translations/de.ts index bd6d7e1c..5a999eb6 100644 --- a/src/ui/translations/de.ts +++ b/src/ui/translations/de.ts @@ -185,18 +185,6 @@ PIN entry disabled PIN-Eingabe deaktiviert - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Authentifizierung und Signierung mit der ID-Karte sind noch nicht möglich. Die ID-Karte muss im Self-Service-Portal der Polizei- und Grenzschutzbehörde aktiviert werden, um sie verwenden zu können. - - - Activate ID-card - ID-Karte aktivieren - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Signieren mit der ID-Karte ist noch nicht möglich. Um zu signieren, muss der PIN2-Code in der DigiDoc4-Anwendung geändert werden. diff --git a/src/ui/translations/en.ts b/src/ui/translations/en.ts index fed85d10..3006ae62 100644 --- a/src/ui/translations/en.ts +++ b/src/ui/translations/en.ts @@ -185,18 +185,6 @@ PIN entry disabled PIN entry disabled - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - - - Activate ID-card - Activate ID-card - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. diff --git a/src/ui/translations/et.ts b/src/ui/translations/et.ts index 4739b71f..b91be603 100644 --- a/src/ui/translations/et.ts +++ b/src/ui/translations/et.ts @@ -137,18 +137,6 @@ PIN entry disabled PIN'i sisestamine on keelatud - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - ID-kaardiga isikutuvastamine ja allkirjastamine ei ole veel võimalik. ID-kaardi kasutamiseks tuleb see aktiveerida Politsei- ja Piirivalveameti iseteeninduses. - - - Activate ID-card - Aktiveeri ID-kaart - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/et/iseteenindus - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. ID-kaardiga allkirjastamine ei ole veel võimalik. Allkirjastamiseks tuleb DigiDoc4 rakenduses PIN2-koodi muuta. diff --git a/src/ui/translations/fi.ts b/src/ui/translations/fi.ts index d4cab230..5f8fa70d 100644 --- a/src/ui/translations/fi.ts +++ b/src/ui/translations/fi.ts @@ -165,18 +165,6 @@ PIN entry disabled PIN-koodin syöttö ei ole käytössä - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Henkilökortilla tunnistautuminen ja allekirjoittaminen eivät ole vielä mahdollisia. Henkilökortti on aktivoitava Poliisin ja Rajavartiolaitoksen itsepalveluportaalissa, jotta sitä voi käyttää. - - - Activate ID-card - Aktivoi henkilökortti - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Henkilökortilla allekirjoittaminen ei ole vielä mahdollista. Allekirjoittamista varten PIN2-koodi on vaihdettava DigiDoc4-sovelluksessa. diff --git a/src/ui/translations/fr.ts b/src/ui/translations/fr.ts index 1239bd2b..03a01d91 100644 --- a/src/ui/translations/fr.ts +++ b/src/ui/translations/fr.ts @@ -185,18 +185,6 @@ PIN entry disabled Saisie du code PIN désactivée - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - L'authentification et la signature avec la carte d'identité ne sont pas encore possibles. La carte d'identité doit être activée sur le portail libre-service de la Police et des Gardes-frontières afin de pouvoir l'utiliser. - - - Activate ID-card - Activer la carte d'identité - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. La signature avec la carte d'identité n'est pas encore possible. Pour signer, le code PIN2 doit être modifié dans l'application DigiDoc4. diff --git a/src/ui/translations/hr.ts b/src/ui/translations/hr.ts index c4cf5595..91338e3b 100644 --- a/src/ui/translations/hr.ts +++ b/src/ui/translations/hr.ts @@ -211,18 +211,6 @@ PIN entry disabled Unos PIN-a onemogućen - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Autentifikacija i potpisivanje osobnom iskaznicom još nisu mogući. Osobnu iskaznicu potrebno je aktivirati putem sustava samoposluživanja Policijske i granične uprave da bi se mogla koristiti. - - - Activate ID-card - Aktiviraj osobnu iskaznicu - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Potpisivanje osobnom iskaznicom još nije moguće. Za potpisivanje je potrebno promijeniti PIN2 kôd u aplikaciji DigiDoc4. diff --git a/src/ui/translations/nl.ts b/src/ui/translations/nl.ts index e45f250d..effec048 100644 --- a/src/ui/translations/nl.ts +++ b/src/ui/translations/nl.ts @@ -185,18 +185,6 @@ PIN entry disabled PIN-invoer uitgeschakeld - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Authenticatie en ondertekenen met de ID-kaart is nog niet mogelijk. De ID-kaart moet worden geactiveerd in het zelfbedieningsportaal van de Politie- en Grensbewakingsraad om deze te kunnen gebruiken. - - - Activate ID-card - ID-kaart activeren - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Ondertekenen met de ID-kaart is nog niet mogelijk. Om te ondertekenen moet de PIN2-code worden gewijzigd in de DigiDoc4-toepassing. diff --git a/src/ui/translations/ru.ts b/src/ui/translations/ru.ts index d85d413e..e7b55845 100644 --- a/src/ui/translations/ru.ts +++ b/src/ui/translations/ru.ts @@ -187,18 +187,6 @@ PIN entry disabled Ввод PIN запрещён - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Идентификация и подписание документов с помощью ID карты пока невозможны. Для использования удостоверения личности его необходимо активировать в системе самообслуживания Управления полиции и пограничной охраны. - - - Activate ID-card - Активировать ID карту - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/ru/samoobsluzhivanie - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Подписание с помощью ID-карты ещё невозможно. Чтобы подписывать, необходимо изменить PIN2 в приложении DigiDoc4. diff --git a/src/ui/translations/sk.ts b/src/ui/translations/sk.ts index 8914e8b2..1cbaa9c8 100644 --- a/src/ui/translations/sk.ts +++ b/src/ui/translations/sk.ts @@ -187,18 +187,6 @@ PIN entry disabled Zadávanie PIN je zakázané - - Authentication and signing with the ID-card isn't possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it. - Autentizácia a podpisovanie pomocou ID karty ešte nie sú možné. Na použitie ID karty je potrebné ju aktivovať v samoobslužnom portáli Policajného a pohraničného zboru. - - - Activate ID-card - Aktivovať ID kartu - - - https://www.politsei.ee/en/self-service-portal - https://www.politsei.ee/en/self-service-portal - Signing with an ID-card isn't possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign. Podpisovanie pomocou ID karty ešte nie je možné. Na podpisovanie je potrebné zmeniť kód PIN2 v aplikácii DigiDoc4. diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp index ee4bc7f1..a544e78e 100644 --- a/src/ui/webeiddialog.cpp +++ b/src/ui/webeiddialog.cpp @@ -641,15 +641,8 @@ void WebEidDialog::setupOK(Func func, const char* text, bool enabled) void WebEidDialog::setupWarning(const EidCertificateAndPinInfo& certAndPinInfo) { - ui->warningBar->setHidden(certAndPinInfo.pin1Active && certAndPinInfo.pin2Active); - if (!certAndPinInfo.pin1Active) { - setTrText(ui->warningLabel, - QT_TR_NOOP("Authentication and signing with the ID-card isn't possible yet. " - "ID-card must be activated in the Police and Border Guard Board’s " - "self-service portal in order to use it.")); - setTrText(ui->warningAction, QT_TR_NOOP("Activate ID-card")); - warningActionUrl = QT_TR_NOOP("https://www.politsei.ee/en/self-service-portal"); - } else if (!certAndPinInfo.pin2Active) { + ui->warningBar->setHidden(certAndPinInfo.pin2Active); + if (!certAndPinInfo.pin2Active) { setTrText(ui->warningLabel, QT_TR_NOOP("Signing with an ID-card isn't possible yet. PIN2 code must be " "changed in DigiDoc4 application in order to sign.")); @@ -747,9 +740,6 @@ void WebEidDialog::openUrl(const QString& url) bool WebEidDialog::isCardActive(const EidCertificateAndPinInfo& certAndPinInfo) const noexcept { - if (!certAndPinInfo.pin1Active) { - return false; - } return currentCommand == CommandType::AUTHENTICATE || certAndPinInfo.pin2Active; }