diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 7b2b375718..703e6a184e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -4972,7 +4972,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. else { LayoutInflater inflator = LayoutInflater.from(getContext()); View dview = inflator.inflate(R.layout.dialog_certificate, null); - TextView tvCaption = dview.findViewById(R.id.tvCaption); + TextView tvCertificateInvalid = dview.findViewById(R.id.tvCertificateInvalid); TextView tvSender = dview.findViewById(R.id.tvSender); TextView tvEmail = dview.findViewById(R.id.tvEmail); TextView tvEmailInvalid = dview.findViewById(R.id.tvEmailInvalid); @@ -4981,9 +4981,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. TextView tvBefore = dview.findViewById(R.id.tvBefore); TextView tvExpired = dview.findViewById(R.id.tvExpired); - tvCaption.setText(valid ? R.string.title_signature_valid : R.string.title_signature_invalid); - if (!valid) - tvCaption.setTextColor(Helper.resolveColor(getContext(), R.attr.colorWarning)); + tvCertificateInvalid.setVisibility(valid ? View.GONE : View.VISIBLE); tvSender.setText(sender); tvEmail.setText(TextUtils.join(",", emails)); tvEmailInvalid.setVisibility(match ? View.GONE : View.VISIBLE); diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml index 8f9c1cae98..d34b300c07 100644 --- a/app/src/main/res/layout/dialog_certificate.xml +++ b/app/src/main/res/layout/dialog_certificate.xml @@ -18,6 +18,17 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + app:layout_constraintTop_toBottomOf="@id/tvCertificateInvalid" /> Message signature valid Message signature valid but not confirmed Message signature invalid + Certificate chain invalid Sender\'s address Signature\'s address The email address of the sender and signature do not match