Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/controller/certandpininfo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ struct EidCertificateAndPinInfo
QSslCertificate certificate {};
CertificateInfo certInfo;
PinInfo pinInfo;
bool pin1Active = true;
bool pin2Active = true;
};

Expand Down
3 changes: 0 additions & 3 deletions src/controller/command-handlers/certificatereader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,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;
}

Expand All @@ -88,7 +86,6 @@ EidCertificateAndPinInfo getCertificateWithStatusAndInfo(ElectronicID::ptr&& eid
.subject = std::move(subject),
},
.pinInfo = std::move(pinInfo),
.pin1Active = pin1Active,
.pin2Active = pin2Active,
};
}
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,6 @@
<source>PIN entry disabled</source>
<translation>Zadávání PINu je zakázáno</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>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.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Aktivovat ID kartu</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Podepisování pomocí ID karty ještě není možné. Pro podepisování je nutné změnit kód PIN2 v aplikaci DigiDoc4.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,18 +185,6 @@
<source>PIN entry disabled</source>
<translation>PIN-Eingabe deaktiviert</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>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.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>ID-Karte aktivieren</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Signieren mit der ID-Karte ist noch nicht möglich. Um zu signieren, muss der PIN2-Code in der DigiDoc4-Anwendung geändert werden.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,18 +185,6 @@
<source>PIN entry disabled</source>
<translation>PIN entry disabled</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Activate ID-card</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/et.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,6 @@
<source>PIN entry disabled</source>
<translation>PIN&apos;i sisestamine on keelatud</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>ID-kaardiga isikutuvastamine ja allkirjastamine ei ole veel võimalik. ID-kaardi kasutamiseks tuleb see aktiveerida Politsei- ja Piirivalveameti iseteeninduses.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Aktiveeri ID-kaart</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/et/iseteenindus</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>ID-kaardiga allkirjastamine ei ole veel võimalik. Allkirjastamiseks tuleb DigiDoc4 rakenduses PIN2-koodi muuta.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,6 @@
<source>PIN entry disabled</source>
<translation>PIN-koodin syöttö ei ole käytössä</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>Henkilökortilla tunnistautuminen ja allekirjoittaminen eivät ole vielä mahdollisia. Henkilökortti on aktivoitava Poliisin ja Rajavartiolaitoksen itsepalveluportaalissa, jotta sitä voi käyttää.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Aktivoi henkilökortti</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Henkilökortilla allekirjoittaminen ei ole vielä mahdollista. Allekirjoittamista varten PIN2-koodi on vaihdettava DigiDoc4-sovelluksessa.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,18 +185,6 @@
<source>PIN entry disabled</source>
<translation>Saisie du code PIN désactivée</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>L&apos;authentification et la signature avec la carte d&apos;identité ne sont pas encore possibles. La carte d&apos;identité doit être activée sur le portail libre-service de la Police et des Gardes-frontières afin de pouvoir l&apos;utiliser.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Activer la carte d&apos;identité</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>La signature avec la carte d&apos;identité n&apos;est pas encore possible. Pour signer, le code PIN2 doit être modifié dans l&apos;application DigiDoc4.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/hr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,18 +211,6 @@
<source>PIN entry disabled</source>
<translation>Unos PIN-a onemogućen</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>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.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Aktiviraj osobnu iskaznicu</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Potpisivanje osobnom iskaznicom još nije moguće. Za potpisivanje je potrebno promijeniti PIN2 kôd u aplikaciji DigiDoc4.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,18 +185,6 @@
<source>PIN entry disabled</source>
<translation>PIN-invoer uitgeschakeld</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>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.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>ID-kaart activeren</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Ondertekenen met de ID-kaart is nog niet mogelijk. Om te ondertekenen moet de PIN2-code worden gewijzigd in de DigiDoc4-toepassing.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,6 @@
<source>PIN entry disabled</source>
<translation>Ввод PIN запрещён</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>Идентификация и подписание документов с помощью ID карты пока невозможны. Для использования удостоверения личности его необходимо активировать в системе самообслуживания Управления полиции и пограничной охраны.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Активировать ID карту</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/ru/samoobsluzhivanie</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Подписание с помощью ID-карты ещё невозможно. Чтобы подписывать, необходимо изменить PIN2 в приложении DigiDoc4.</translation>
Expand Down
12 changes: 0 additions & 12 deletions src/ui/translations/sk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,6 @@
<source>PIN entry disabled</source>
<translation>Zadávanie PIN je zakázané</translation>
</message>
<message>
<source>Authentication and signing with the ID-card isn&apos;t possible yet. ID-card must be activated in the Police and Border Guard Board’s self-service portal in order to use it.</source>
<translation>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.</translation>
</message>
<message>
<source>Activate ID-card</source>
<translation>Aktivovať ID kartu</translation>
</message>
<message>
<source>https://www.politsei.ee/en/self-service-portal</source>
<translation>https://www.politsei.ee/en/self-service-portal</translation>
</message>
<message>
<source>Signing with an ID-card isn&apos;t possible yet. PIN2 code must be changed in DigiDoc4 application in order to sign.</source>
<translation>Podpisovanie pomocou ID karty ešte nie je možné. Na podpisovanie je potrebné zmeniť kód PIN2 v aplikácii DigiDoc4.</translation>
Expand Down
14 changes: 2 additions & 12 deletions src/ui/webeiddialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -660,15 +660,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."));
Expand Down Expand Up @@ -766,9 +759,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;
}

Expand Down
Loading