replace message after comparison check with that provided in signed file

This commit is contained in:
Craig Raw 2024-09-13 09:49:24 +02:00
parent 0646c8aa28
commit faa81f2273

View file

@ -553,7 +553,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
String signedAddress = matcher.group(2); String signedAddress = matcher.group(2);
String signedSignature = matcher.group(3); String signedSignature = matcher.group(3);
if(!signedMessage.trim().equals(message.getText().trim().replaceAll("\r*\n*", ""))) { if(!message.getText().isEmpty() && !signedMessage.trim().equals(message.getText().trim().replaceAll("\r*\n*", ""))) {
AppServices.showErrorDialog("Incorrect Message", "The file contained a different message of:\n\n" + signedMessage); AppServices.showErrorDialog("Incorrect Message", "The file contained a different message of:\n\n" + signedMessage);
return; return;
} else if(!signedAddress.trim().equals(address.getText().trim())) { } else if(!signedAddress.trim().equals(address.getText().trim())) {
@ -561,6 +561,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
return; return;
} }
message.setText(signedMessage);
signature.setText(signedSignature); signature.setText(signedSignature);
} else { } else {
signature.setText(content); signature.setText(content);