Show warning when key has transaction ID (#1208)

metsma · web-flow · commit 3bf245b39f65 · 2023-07-14T22:59:28.000+03:00
CDOC-1

Signed-off-by: Raul Metsma &lt;raul@metsma.ee&gt;
diff --git a/client/CryptoDoc.cpp b/client/CryptoDoc.cpp
@@ -321,7 +321,7 @@ bool CryptoDoc::decrypt()
 		return false;
 	}
 
-	if(d->cdoc->version() == 2 && Settings::CDOC2_USE_KEYSERVER && !Settings::CDOC2_NOTIFICATION.isSet())
+	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. "

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ bool CryptoDoc::decrypt()`
`321`	`321`	`return false;`
`322`	`322`	`}`
`323`	`323`
`324`		`- if(d->cdoc->version() == 2 && Settings::CDOC2_USE_KEYSERVER && !Settings::CDOC2_NOTIFICATION.isSet())`
	`324`	`+ if(d->cdoc->version() == 2 && !key.transaction_id.isEmpty() && !Settings::CDOC2_NOTIFICATION.isSet())`
`325`	`325`	`{`
`326`	`326`	`auto *dlg = new WarningDialog(tr("You must enter your PIN code twice in order to decrypt the CDOC2 container. "`
`327`	`327`	`"The first PIN entry is required for authentication to the key server referenced in the CDOC2 container. "`