From 44ce16572e287b979f7791bbd2c5024e8b3e946d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 23 Dec 2024 07:34:24 +0100
Subject: [PATCH] Always show key algo

---
 .../eu/faircode/email/FragmentMessages.java   | 15 +------
 .../main/res/layout/dialog_certificate.xml    | 40 ++-----------------
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b89afbb7bb..7011ccaf02 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -10432,9 +10432,7 @@ public class FragmentMessages extends FragmentBase
                             boolean valid = args.getBoolean("valid");
                             String reason = args.getString("reason");
                             String algo = args.getString("algo");
-                            String algooid = args.getString("algooid");
                             String keyalgo = args.getString("keyalgo");
-                            String keyalgooid = args.getString("keyalgooid");
                             final ArrayList<String> trace = args.getStringArrayList("trace");
                             EntityCertificate record = EntityCertificate.from(cert, null);
 
@@ -10466,10 +10464,7 @@ public class FragmentMessages extends FragmentBase
                                 TextView tvBefore = dview.findViewById(R.id.tvBefore);
                                 TextView tvExpired = dview.findViewById(R.id.tvExpired);
                                 TextView tvAlgorithm = dview.findViewById(R.id.tvAlgorithm);
-                                TextView tvAlgorithmOid = dview.findViewById(R.id.tvAlgorithmOid);
-                                TextView tvKeyAlgorithmTitle = dview.findViewById(R.id.tvKeyAlgorithmTitle);
                                 TextView tvKeyAlgorithm = dview.findViewById(R.id.tvKeyAlgorithm);
-                                TextView tvKeyAlgorithmOid = dview.findViewById(R.id.tvKeyAlgorithmOid);
 
                                 tvCertificateInvalid.setVisibility(valid ? View.GONE : View.VISIBLE);
                                 tvCertificateReason.setText(reason);
@@ -10486,19 +10481,11 @@ public class FragmentMessages extends FragmentBase
 
                                 if (!TextUtils.isEmpty(algo))
                                     algo = algo.replaceAll("(?i)With", "/");
-
-                                tvAlgorithm.setText(algo);
-                                tvAlgorithmOid.setVisibility(info ? View.VISIBLE : View.GONE);
-                                tvAlgorithmOid.setText(algooid);
-
                                 if (!TextUtils.isEmpty(keyalgo))
                                     keyalgo = keyalgo.replaceAll("(?i)With", "/");
 
-                                tvKeyAlgorithmTitle.setVisibility(info ? View.VISIBLE : View.GONE);
-                                tvKeyAlgorithm.setVisibility(info ? View.VISIBLE : View.GONE);
+                                tvAlgorithm.setText(algo);
                                 tvKeyAlgorithm.setText(keyalgo);
-                                tvKeyAlgorithmOid.setVisibility(info ? View.VISIBLE : View.GONE);
-                                tvKeyAlgorithmOid.setText(keyalgooid);
 
                                 AlertDialog.Builder builder = new AlertDialog.Builder(getContext())
                                         .setView(dview)
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index 5b310bd93a..541e6c396b 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -184,34 +184,12 @@
             android:id="@+id/tvAlgorithm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="SHA256/RSA"
+            android:text="SHA256"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAlgorithmTitle" />
 
-        <TextView
-            android:id="@+id/tvAlgorithmOid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1.2.840.113549.1.1.11"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
-            android:textIsSelectable="true"
-            android:textSize="10sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAlgorithm" />
-
-        <TextView
-            android:id="@+id/tvKeyAlgorithmTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="@string/title_advanced_section_encryption"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvExpired" />
-
         <TextView
             android:id="@+id/tvKeyAlgorithm"
             android:layout_width="wrap_content"
@@ -219,20 +197,8 @@
             android:text="SHA256/RSA"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:textColorPrimary"
-            android:textSize="12sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAlgorithmTitle" />
-
-        <TextView
-            android:id="@+id/tvKeyAlgorithmOid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1.2.840.113549.1.1.11"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="10sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvKeyAlgorithm" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAlgorithm" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file