Added message S/MIME certificate invalid

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);

app/src/main/res/layout/dialog_certificate.xml

@@ -18,6 +18,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/tvCertificateInvalid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/title_signature_certificate_invalid"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?attr/colorWarning"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvCaption" />
+
         <TextView
             android:id="@+id/tvSenderTitle"
             android:layout_width="wrap_content"
@@ -26,7 +37,7 @@
             android:text="@string/title_signature_sender"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCaption" />
+            app:layout_constraintTop_toBottomOf="@id/tvCertificateInvalid" />
 
         <TextView
             android:id="@+id/tvSender"

app/src/main/res/values/strings.xml

@@ -780,6 +780,7 @@
     <string name="title_signature_valid">Message signature valid</string>
     <string name="title_signature_unconfirmed">Message signature valid but not confirmed</string>
     <string name="title_signature_invalid">Message signature invalid</string>
+    <string name="title_signature_certificate_invalid">Certificate chain invalid</string>
     <string name="title_signature_sender">Sender\'s address</string>
     <string name="title_signature_email">Signature\'s address</string>
     <string name="title_signature_mismatch">The email address of the sender and signature do not match</string>