Update PUK messages (#1355)

IB-8375

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

Author: metsma

client/Application.cpp

@@ -312,6 +312,10 @@ Application::Application( int &argc, char **argv )
 	setWindowIcon(QIcon(QStringLiteral(":/images/Icon.svg")));
 	if(QFile::exists(QStringLiteral("%1/%2.log").arg(QDir::tempPath(), applicationName())))
 		qInstallMessageHandler(msgHandler);
+	QPalette p = palette();
+	p.setBrush(QPalette::Link, QBrush("#2F70B6"));
+	p.setBrush(QPalette::LinkVisited, QBrush("#2F70B6"));
+	setPalette(p);
 
 #if defined(Q_OS_WIN)
 	AllowSetForegroundWindow( ASFW_ANY );

client/QSmartCard.cpp

@@ -500,7 +500,7 @@ QSmartCard::ErrorType QSmartCard::pinChange(QSmartCardData::PinType type, QWidge
 	if (!d->t.isPinpad())
 	{
 		p.reset(new PinUnblock(PinUnblock::PinChange, parent, type, d->t.retryCount(type), d->t.data(QSmartCardData::BirthDate).toDate(),
-			d->t.data(QSmartCardData::Id).toString()));
+			d->t.data(QSmartCardData::Id).toString(), d->t.isPUKReplacable()));
 		if (!p->exec())
 			return CancelError;
 		oldPin = p->firstCodeText().toUtf8();
@@ -524,7 +524,7 @@ QSmartCard::ErrorType QSmartCard::pinUnblock(QSmartCardData::PinType type, bool
 	if (!d->t.isPinpad())
 	{
 		p.reset(new PinUnblock(isForgotPin ? PinUnblock::ChangePinWithPuk : PinUnblock::UnBlockPinWithPuk, parent, type,
-			d->t.retryCount(QSmartCardData::PukType), d->t.data(QSmartCardData::BirthDate).toDate(), d->t.data(QSmartCardData::Id).toString()));
+			d->t.retryCount(QSmartCardData::PukType), d->t.data(QSmartCardData::BirthDate).toDate(), d->t.data(QSmartCardData::Id).toString(), d->t.isPUKReplacable()));
 		if (!p->exec())
 			return CancelError;
 		puk = p->firstCodeText().toUtf8();

client/dialogs/PinUnblock.cpp

@@ -25,7 +25,7 @@
 #include <QtGui/QRegularExpressionValidator>
 
 PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType type,
-	short leftAttempts, QDate birthDate, const QString &personalCode)
+	short leftAttempts, QDate birthDate, const QString &personalCode, bool isPUKReplacable)
 	: QDialog(parent)
 	, ui(new Ui::PinUnblock)
 {
@@ -58,9 +58,10 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 		regexpValidateCode = pattern(QSmartCardData::PukType);
 		ui->line1_text->setText(tr("To unblock the certificate you have to enter the PUK code."));
 		ui->line2_text->setText(tr("You can find your PUK code inside the ID-card codes envelope."));
-		ui->line3_text->setText(tr("If you have forgotten the PUK code for your ID card, please visit "
-								   "<a href=\"https://www.politsei.ee/en/\"><span style=\"color: #006EB5; text-decoration: none;\">"
-								   "the Police and Border Guard Board service center</span></a> to obtain new PIN codes."));
+		ui->line3_text->setText(isPUKReplacable ? tr("If you have forgotten the PUK code for your ID card, please visit "
+			"<a href=\"https://www.politsei.ee/en/\">the Police and Border Guard Board service center</a> to obtain new PIN codes.") :
+			tr("If you have forgotten the PUK code of your ID-card then you can view it from the Police and Border Guard Board portal. "
+			"<a href=\"https://www.id.ee/en/article/my-pin-is-blocked-locked/\">Additional information</a>"));
 		break;
 	case PinUnblock::ChangePinWithPuk:
 		ui->label->setText(tr("%1 code change").arg(QSmartCardData::typeString(type)));
@@ -78,8 +79,8 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 		if(type == QSmartCardData::PukType)
 		{
 			ui->line1_text->setText(tr("PUK code is used for unblocking the certificates, when PIN1 or PIN2 has been entered 3 times incorrectly."));
-			ui->line2_text->setText(tr("If you forget the PUK code or the certificates remain blocked, you have to visit the <a href=\"https://www.politsei.ee/en/\">"
-									   "<span style=\"color: #006EB5; text-decoration: none;\">service center</span></a> to obtain new codes."));
+			ui->line2_text->setText(tr("If you forget the PUK code or the certificates remain blocked, you have to visit the "
+									   "<a href=\"https://www.politsei.ee/en/\">service center</a> to obtain new codes."));
 			break;
 		}
 		ui->line1_text->setText(type == QSmartCardData::Pin2Type
@@ -132,7 +133,7 @@ PinUnblock::PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType t
 	connect(ui->puk, &QLineEdit::textEdited, ui->errorPuk, [this, setError] {
 		setError(ui->puk, ui->errorPuk, {});
 	});
-	connect(ui->change, &QPushButton::clicked, this, [=,
+	connect(ui->change, &QPushButton::clicked, this, [=, this,
 			regexpNewCode = std::move(regexpNewCode),
 			regexpValidateCode = std::move(regexpValidateCode)] {
 		const static QString SEQUENCE_ASCENDING = QStringLiteral("1234567890123456789012");

client/dialogs/PinUnblock.h

@@ -21,7 +21,6 @@
 
 #include "QSmartCard.h"
 
-#include <QtCore/QRegularExpression>
 #include <QDate>
 #include <QDialog>
 
@@ -39,7 +38,7 @@ class PinUnblock final : public QDialog
 		PinChange,
 	};
 	PinUnblock(WorkMode mode, QWidget *parent, QSmartCardData::PinType type,
-		 short leftAttempts, QDate birthDate, const QString &personalCode);
+		 short leftAttempts, QDate birthDate, const QString &personalCode, bool isPUKReplacable);
 	~PinUnblock() final;
 
 	QString firstCodeText() const;

client/dialogs/SettingsDialog.ui

@@ -1694,7 +1694,7 @@ background: none;
          </property>
          <property name="text">
           <string>&lt;p&gt;Estonian ID-software is released by Information Systems's Authority&lt;br /&gt;
-In case of questions please contact our support via &lt;a href=&quot;https://www.id.ee/en/id-help/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;id.ee&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;
+In case of questions please contact our support via &lt;a href=&quot;https://www.id.ee/en/id-help/&quot;&gt;id.ee&lt;/a&gt;.&lt;/p&gt;
 Additional licenses and components</string>
          </property>
          <property name="alignment">
@@ -1745,16 +1745,16 @@ background: none;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; }
 &lt;/style&gt;&lt;/head&gt;&lt;body&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;Qt cross-platform application and UI framework&lt;/b&gt;&lt;br /&gt;GNU Lesser General Public License (LGPL) version 3&lt;br /&gt;&lt;a href=&quot;http://doc.qt.io/qt-6/licensing.html&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;http://doc.qt.io/qt-6/licensing.html&lt;/a&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;The OpenSSL project&lt;/b&gt;&lt;br /&gt;This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)&lt;br /&gt;&lt;a href=&quot;https://www.openssl.org/source/apache-license-2.0.txt&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;https://www.openssl.org/source/apache-license-2.0.txt&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;OpenLDAP community developed LDAP software&lt;/b&gt;&lt;br /&gt;The OpenLDAP Public License&lt;br /&gt;&lt;a href=&quot;http://www.openldap.org/software/release/license.html&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;http://www.openldap.org/software/release/license.html&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;libdigidocpp&lt;/b&gt;&lt;br /&gt;GNU Lesser General Public License (LGPL) version 2.1&lt;br /&gt;&lt;a href=&quot;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;DigiDoc4 Client&lt;/b&gt;&lt;br /&gt;GNU Lesser General Public License (LGPL) version 2.1&lt;br /&gt;&lt;a href=&quot;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;zlib A Massively Spiffy Yet Delicately Unobtrusive Compression Library&lt;/b&gt;&lt;br /&gt;&lt;a href=&quot;http://zlib.net/zlib_license.html&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;http://zlib.net/zlib_license.html&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;libxml2 is an XML toolkit implemented in C&lt;/b&gt;&lt;br /&gt;MIT License&lt;br /&gt;&lt;a href=&quot;https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/Copyright?ref_type=heads&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/Copyright?ref_type=heads&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;XML Security Library is a C library based on LibXML2&lt;/b&gt;&lt;br /&gt;MIT License&lt;br /&gt;&lt;a href=&quot;https://github.com/lsh123/xmlsec/blob/master/Copyright&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;https://github.com/lsh123/xmlsec/blob/master/Copyright&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;JSON for Modern C++&lt;/b&gt;&lt;br /&gt;MIT License&lt;br /&gt;&lt;a href=&quot;https://github.com/nlohmann/json/blob/develop/LICENSE.MIT&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;https://github.com/nlohmann/json/blob/develop/LICENSE.MIT&lt;/a&gt; &lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;b&gt;Roboto: Google’s signature family of fonts&lt;/b&gt;&lt;br /&gt;Apache Software License, Version 2.0&lt;br /&gt;&lt;a href=&quot;https://github.com/google/roboto/blob/master/LICENSE&quot; style=&quot; text-decoration: underline; color:#006eb5;&quot;&gt;https://github.com/google/roboto/blob/master/LICENSE&lt;/a&gt; &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;Qt cross-platform application and UI framework&lt;/b&gt;&lt;br /&gt;GNU Lesser General Public License (LGPL) version 3&lt;br /&gt;&lt;a href=&quot;http://doc.qt.io/qt-6/licensing.html&quot;&gt;http://doc.qt.io/qt-6/licensing.html&lt;/a&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;The OpenSSL project&lt;/b&gt;&lt;br /&gt;This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)&lt;br /&gt;&lt;a href=&quot;https://www.openssl.org/source/apache-license-2.0.txt&quot;&gt;https://www.openssl.org/source/apache-license-2.0.txt&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;OpenLDAP community developed LDAP software&lt;/b&gt;&lt;br /&gt;The OpenLDAP Public License&lt;br /&gt;&lt;a href=&quot;http://www.openldap.org/software/release/license.html&quot;&gt;http://www.openldap.org/software/release/license.html&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;libdigidocpp&lt;/b&gt;&lt;br /&gt;GNU Lesser General Public License (LGPL) version 2.1&lt;br /&gt;&lt;a href=&quot;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&quot;&gt;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;DigiDoc4 Client&lt;/b&gt;&lt;br /&gt;GNU Lesser General Public License (LGPL) version 2.1&lt;br /&gt;&lt;a href=&quot;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&quot;&gt;http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;zlib A Massively Spiffy Yet Delicately Unobtrusive Compression Library&lt;/b&gt;&lt;br /&gt;&lt;a href=&quot;http://zlib.net/zlib_license.html&quot;&gt;http://zlib.net/zlib_license.html&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;libxml2 is an XML toolkit implemented in C&lt;/b&gt;&lt;br /&gt;MIT License&lt;br /&gt;&lt;a href=&quot;https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/Copyright?ref_type=heads&quot;&gt;https://gitlab.gnome.org/GNOME/libxml2/-/blob/master/Copyright?ref_type=heads&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;XML Security Library is a C library based on LibXML2&lt;/b&gt;&lt;br /&gt;MIT License&lt;br /&gt;&lt;a href=&quot;https://github.com/lsh123/xmlsec/blob/master/Copyright&quot;&gt;https://github.com/lsh123/xmlsec/blob/master/Copyright&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;JSON for Modern C++&lt;/b&gt;&lt;br /&gt;MIT License&lt;br /&gt;&lt;a href=&quot;https://github.com/nlohmann/json/blob/develop/LICENSE.MIT&quot;&gt;https://github.com/nlohmann/json/blob/develop/LICENSE.MIT&lt;/a&gt; &lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;b&gt;Roboto: Google’s signature family of fonts&lt;/b&gt;&lt;br /&gt;Apache Software License, Version 2.0&lt;br /&gt;&lt;a href=&quot;https://github.com/google/roboto/blob/master/LICENSE&quot;&gt;https://github.com/google/roboto/blob/master/LICENSE&lt;/a&gt; &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
           <set>Qt::TextBrowserInteraction</set>

client/dialogs/SignatureDialog.cpp

@@ -41,7 +41,7 @@ SignatureDialog::SignatureDialog(const DigiDocSignature &signature, QWidget *par
 	d->error->hide();
 	connect(d->showErrors, &AccordionTitle::toggled, d->showRole, [this](bool open) {
 		d->showRole->setChecked(!open);
-		d->error->setVisible(open);
+		d->error->setVisible(open && !d->showErrors->isHidden());
 	});
 	connect(d->showRole, &AccordionTitle::toggled, d->showErrors, [this](bool open) {
 		d->showErrors->setChecked(!open);