Update Warning dialogs

IB-7962

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

Author: metsma

client/Application.cpp

@@ -197,11 +197,12 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 		if(static std::atomic_bool isShown(false); !isShown.exchange(true))
 		{
 			dispatchToMain([] {
-				WarningDialog::show(Application::tr(
+				WarningDialog::create()->withText(Application::tr(
 					"The renewal of Trust Service status List, used for digital signature validation, has failed. "
 					"Please check your internet connection and make sure you have the latest ID-software version "
 					"installed. An expired Trust Service List (TSL) will be used for signature validation. "
-					"<a href=\"https://www.id.ee/en/article/digidoc4-message-updating-the-list-of-trusted-certificates-was-unsuccessful/\">Additional information</a>"), QString());
+					"<a href=\"https://www.id.ee/en/article/digidoc4-message-updating-the-list-of-trusted-certificates-was-unsuccessful/\">Additional information</a>"))
+					->open();
 			});
 		}
 		return true;
@@ -354,7 +355,7 @@ Application::Application( int &argc, char **argv )
 		WarningDialog *dlg{};
 		if(lessThanVersion(QLatin1String("QDIGIDOC4-UNSUPPORTED")))
 		{
-			dlg = WarningDialog::show(tr(
+			dlg = WarningDialog::create()->withText(tr(
 				"This version of ID-software on your computer is unsupported. "
 				"DigiDoc4 Client cannot be used until you update ID-software. "
 				"Install new ID-software from <a href=\"https://www.id.ee/en/article/install-id-software/\">www.id.ee</a>. "
@@ -364,7 +365,7 @@ Application::Application( int &argc, char **argv )
 		}
 		else if(lessThanVersion(QLatin1String("QDIGIDOC4-SUPPORTED")))
 		{
-			dlg = WarningDialog::show(tr(
+			dlg = WarningDialog::create()->withText(tr(
 				"Your ID-software has expired. To download the latest software version, go to the "
 				"<a href=\"https://www.id.ee/en/article/install-id-software/\">id.ee</a> website. "
 				"macOS users can download the latest ID-software version from the "
@@ -373,26 +374,25 @@ Application::Application( int &argc, char **argv )
 		connect(d->conf, &Configuration::finished, this, [lessThanVersion](bool changed, const QString &){
 			if(changed && lessThanVersion(QLatin1String("QDIGIDOC4-LATEST")))
 			{
-				auto *dlg = new WarningDialog(tr(
+				auto *dlg = WarningDialog::create(activeWindow())->withText(tr(
 					"An ID-software update has been found. To download the update, go to the "
 					"<a href=\"https://www.id.ee/en/article/install-id-software/\">id.ee</a> website. "
 					"macOS users can download the update from the "
-					"<a href=\"https://itunes.apple.com/ee/developer/ria/id556524921?mt=12\">Mac App Store</a>."), activeWindow());
+					"<a href=\"https://itunes.apple.com/ee/developer/ria/id556524921?mt=12\">Mac App Store</a>."));
 				new Overlay(dlg, activeWindow());
 				dlg->exec();
 			}
 		});
 #ifdef Q_OS_WIN
 		if(dlg)
 		{
-			dlg->addButton(tr("Start downloading"), 2);
-			connect(dlg, &WarningDialog::finished, this, [](int result) {
-				if(result != 2)
-					return;
+			dlg->addButton(tr("Start downloading"), QMessageBox::Ok);
+			connect(dlg, &WarningDialog::accepted, this, [] {
 				QString path = QApplication::applicationDirPath() + QLatin1String("/id-updater.exe");
 				if (QFile::exists(path))
 					QProcess::startDetached(path, {});
 			});
+			dlg->open();
 		}
 #endif
 	}, Qt::QueuedConnection);
@@ -470,8 +470,8 @@ Application::Application( int &argc, char **argv )
 #ifdef Q_OS_MAC
 		if(!Settings::PLUGINS.isSet())
 		{
-			auto *dlg = new WarningDialog(tr(
-				"In order to authenticate and sign in e-services with an ID-card you need to install the web browser components."), mainWindow());
+			auto *dlg = WarningDialog::create()
+				->withText(tr("In order to authenticate and sign in e-services with an ID-card you need to install the web browser components."));
 			dlg->setCancelText(tr("Ignore forever"));
 			dlg->addButton(tr("Remind later"), QMessageBox::Ignore);
 			dlg->addButton(tr("Install"), QMessageBox::Open);
@@ -809,11 +809,15 @@ bool Application::notify(QObject *object, QEvent *event)
 	}
 	catch(const std::bad_alloc &e)
 	{
-		WarningDialog::show(tr("Added file(s) exceeds the maximum size limit of the container(120MB)."), QString::fromLocal8Bit(e.what()));
+		WarningDialog::create()
+			->withTitle(DocumentModel::tr("Failed to add file"))
+			->withText(tr("Added file(s) exceeds the maximum size limit of the container(120MB)."))
+			->withDetails(QString::fromLocal8Bit(e.what()))
+			->open();
 	}
 	catch(...)
 	{
-		WarningDialog::show(tr("Caught exception!"));
+		WarningDialog::create()->withTitle(tr("Caught exception!"))->open();
 	}
 
 	return false;
@@ -944,11 +948,11 @@ void Application::showClient(QStringList files, bool crypto, bool sign, bool new
 	});
 }
 
-void Application::showWarning( const QString &msg, const digidoc::Exception &e )
+void Application::showWarning(const QString &title, const digidoc::Exception &e)
 {
 	digidoc::Exception::ExceptionCode code = digidoc::Exception::General;
 	QStringList causes = DigiDoc::parseException(e, code);
-	WarningDialog::show(msg, causes.join('\n'));
+	WarningDialog::create()->withTitle(title)->withDetails(causes.join('\n'))->open();
 }
 
 QSigner* Application::signer() const { return d->signer; }

client/Application.h

@@ -92,7 +92,7 @@ private Q_SLOTS:
 	static void msgHandler(QtMsgType type, const QMessageLogContext &ctx, const QString &msg);
 	static void parseArgs(const QString &msg = {});
 	static void parseArgs(QStringList args);
-	static void showWarning(const QString &msg, const digidoc::Exception &e);
+	static void showWarning(const QString &title, const digidoc::Exception &e);
 #if defined(Q_OS_MAC)
 	static void initMacEvents();
 	static void deinitMacEvents();

client/CDoc1.cpp

@@ -24,10 +24,10 @@
 #include "QCryptoBackend.h"
 #include "QSigner.h"
 #include "Utils.h"
-#include "dialogs/FileDialog.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QDebug>
+#include <QtCore/QDir>
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QXmlStreamWriter>
 #include <QtNetwork/QSslKey>
@@ -195,7 +195,7 @@ bool CDoc1::decryptPayload(const QByteArray &key)
 		return setLastError(CryptoDoc::tr("Error parsing document"));
 	data = Crypto::cipher(ENC_MTH[method], key, data, false);
 	if(data.isEmpty())
-		return setLastError(CryptoDoc::tr("Failed to decrypt document"));
+		return setLastError(QCoreApplication::translate("QSigner", "Failed to decrypt document"));
 
 	// remove ANSIX923 padding
 	if(data.size() > 0 && method == AES128CBC_MTH)

client/CryptoDoc.cpp

@@ -49,7 +49,7 @@ class CryptoDoc::Private final: public QThread
 {
 	Q_OBJECT
 public:
-	bool isEncryptedWarning() const;
+	bool isEncryptedWarning(const QString &title) const;
 	void run() final;
 	inline void waitForFinished()
 	{
@@ -67,12 +67,12 @@ class CryptoDoc::Private final: public QThread
 	QStringList		tempFiles;
 };
 
-bool CryptoDoc::Private::isEncryptedWarning() const
+bool CryptoDoc::Private::isEncryptedWarning(const QString &title) const
 {
 	if( fileName.isEmpty() )
-		WarningDialog::show(CryptoDoc::tr("Container is not open"));
+		WarningDialog::create()->withTitle(title)->withText(CryptoDoc::tr("Container is not open"))->open();
 	if(isEncrypted)
-		WarningDialog::show(CryptoDoc::tr("Container is encrypted"));
+		WarningDialog::create()->withTitle(title)->withText(CryptoDoc::tr("Container is encrypted"))->open();
 	return fileName.isEmpty() || isEncrypted;
 }
 
@@ -96,7 +96,7 @@ CDocumentModel::CDocumentModel(CryptoDoc::Private *doc)
 
 bool CDocumentModel::addFile(const QString &file, const QString &mime)
 {
-	if( d->isEncryptedWarning() )
+	if(d->isEncryptedWarning(DocumentModel::tr("Failed to add file")))
 		return false;
 
 	QFileInfo info(file);
@@ -105,8 +105,11 @@ bool CDocumentModel::addFile(const QString &file, const QString &mime)
 
 	if(d->cdoc->version() == 1 && info.size() > 120*1024*1024)
 	{
-		WarningDialog::show(tr("Added file(s) exceeds the maximum size limit of the container (∼120MB). "
-			"<a href='https://www.id.ee/en/article/encrypting-large-120-mb-files/'>Read more about it</a>"));
+		WarningDialog::create()
+			->withTitle(DocumentModel::tr("Failed to add file"))
+			->withText(tr("Added file(s) exceeds the maximum size limit of the container (∼120MB). "
+				"<a href='https://www.id.ee/en/article/encrypting-large-120-mb-files/'>Read more about it</a>"))
+			->open();
 		return false;
 	}
 
@@ -137,7 +140,10 @@ QString CDocumentModel::copy(int row, const QString &dst) const
 	file.data->seek(0);
 	if(QFile f(dst); f.open(QFile::WriteOnly) && copyIODevice(file.data.get(), &f) == file.size)
 		return dst;
-	WarningDialog::show(tr("Failed to save file '%1'").arg(dst));
+	WarningDialog::create()
+		->withTitle(FileDialog::tr("Failed to save file"))
+		->withText(dst)
+		->open();
 	return {};
 }
 
@@ -175,12 +181,15 @@ void CDocumentModel::open(int row)
 
 bool CDocumentModel::removeRow(int row)
 {
-	if(d->isEncryptedWarning())
+	if(d->isEncryptedWarning(DocumentModel::tr("Failed remove document from container")))
 		return false;
 
 	if(d->cdoc->files.empty() || row >= d->cdoc->files.size())
 	{
-		WarningDialog::show(DocumentModel::tr("Internal error"));
+		WarningDialog::create()
+			->withTitle(DocumentModel::tr("Failed remove document from container"))
+			->withText(DocumentModel::tr("Internal error"))
+			->open();
 		return false;
 	}
 
@@ -307,11 +316,14 @@ CryptoDoc::~CryptoDoc() { clear(); delete d; }
 
 bool CryptoDoc::addKey( const CKey &key )
 {
-	if(d->isEncryptedWarning())
+	if(d->isEncryptedWarning(tr("Failed to add key")))
 		return false;
 	if(d->cdoc->keys.contains(key))
 	{
-		WarningDialog::show(tr("Key already exists"));
+		WarningDialog::create()
+			->withTitle(tr("Failed to add key"))
+			->withText(tr("Key already exists"))
+			->open();
 		return false;
 	}
 	d->cdoc->keys.append(key);
@@ -349,7 +361,10 @@ bool CryptoDoc::decrypt()
 {
 	if( d->fileName.isEmpty() )
 	{
-		WarningDialog::show(tr("Container is not open"));
+		WarningDialog::create()
+			->withTitle(QSigner::tr("Failed to decrypt document"))
+			->withText(tr("Container is not open"))
+			->open();
 		return false;
 	}
 	if(!d->isEncrypted)
@@ -358,15 +373,20 @@ bool CryptoDoc::decrypt()
 	CKey key = d->cdoc->canDecrypt(qApp->signer()->tokenauth().cert());
 	if(key.key.isEmpty())
 	{
-		WarningDialog::show(tr("You do not have the key to decrypt this document"));
+		WarningDialog::create()
+			->withTitle(QSigner::tr("Failed to decrypt document"))
+			->withText(tr("You do not have the key to decrypt this document"))
+			->open();
 		return false;
 	}
 
 	if(d->cdoc->version() == 2 && !key.transaction_id.isEmpty() && !Settings::CDOC2_NOTIFICATION.isSet())
 	{
-		auto *dlg = new WarningDialog(tr("You must enter your PIN code twice in order to decrypt the CDOC2 container. "
-			"The first PIN entry is required for authentication to the key server referenced in the CDOC2 container. "
-			"Second PIN entry is required to decrypt the CDOC2 container."), Application::mainWindow());
+		auto *dlg = WarningDialog::create()
+			->withTitle(QSigner::tr("Failed to decrypt document"))
+			->withText(tr("You must enter your PIN code twice in order to decrypt the CDOC2 container. "
+				"The first PIN entry is required for authentication to the key server referenced in the CDOC2 container. "
+				"Second PIN entry is required to decrypt the CDOC2 container."));
 		dlg->setCancelText(WarningDialog::Cancel);
 		dlg->addButton(WarningDialog::OK, QMessageBox::Ok);
 		dlg->addButton(tr("Don't show again"), QMessageBox::Ignore);
@@ -386,15 +406,25 @@ bool CryptoDoc::decrypt()
 #endif
 	if(d->key.isEmpty())
 	{
-		WarningDialog::show(tr("Failed to decrypt document. Please check your internet connection and network settings."), d->cdoc->lastError);
+		WarningDialog::create()
+			->withTitle(QSigner::tr("Failed to decrypt document"))
+			->withText(tr("Please check your internet connection and network settings."))
+			->withDetails(d->cdoc->lastError)
+			->open();
 		return false;
 	}
 
 	d->waitForFinished();
 	if(d->isEncrypted)
-		WarningDialog::show(tr("Error parsing document"));
+		WarningDialog::create()
+			->withTitle(QSigner::tr("Failed to decrypt document"))
+			->withText(tr("Error parsing document"))
+			->open();
 	if(!d->cdoc->lastError.isEmpty())
-		WarningDialog::show(d->cdoc->lastError);
+		WarningDialog::create()
+			->withTitle(QSigner::tr("Failed to decrypt document"))
+			->withDetails(d->cdoc->lastError)
+			->open();
 
 	return !d->isEncrypted;
 }
@@ -407,22 +437,32 @@ bool CryptoDoc::encrypt( const QString &filename )
 		d->fileName = filename;
 	if( d->fileName.isEmpty() )
 	{
-		WarningDialog::show(tr("Container is not open"));
+		WarningDialog::create()
+			->withTitle(tr("Failed to encrypt document"))
+			->withText(tr("Container is not open"))
+			->open();
 		return false;
 	}
 	if(d->isEncrypted)
 		return true;
 	if(d->cdoc->keys.isEmpty())
 	{
-		WarningDialog::show(tr("No keys specified"));
+		WarningDialog::create()
+			->withTitle(tr("Failed to encrypt document"))
+			->withText(tr("No keys specified"))
+			->open();
 		return false;
 	}
 
 	d->waitForFinished();
 	if(d->isEncrypted)
 		open(d->fileName);
 	else
-		WarningDialog::show(tr("Failed to encrypt document. Please check your internet connection and network settings."), d->cdoc->lastError);
+		WarningDialog::create()
+			->withTitle(tr("Failed to encrypt document"))
+			->withText(tr("Please check your internet connection and network settings."))
+			->withDetails(d->cdoc->lastError)
+			->open();
 	return d->isEncrypted;
 }
 
@@ -450,7 +490,10 @@ bool CryptoDoc::open( const QString &file )
 	d->isEncrypted = bool(d->cdoc);
 	if(!d->isEncrypted || d->cdoc->keys.isEmpty())
 	{
-		WarningDialog::show(tr("Failed to open document"), d->cdoc->lastError);
+		WarningDialog::create()
+			->withTitle(tr("Failed to open document"))
+			->withDetails(d->cdoc->lastError)
+			->open();
 		return false;
 	}
 	Application::addRecent( file );
@@ -459,7 +502,7 @@ bool CryptoDoc::open( const QString &file )
 
 void CryptoDoc::removeKey( int id )
 {
-	if(!d->isEncryptedWarning())
+	if(!d->isEncryptedWarning(tr("Failed to remove key")))
 		d->cdoc->keys.removeAt(id);
 }