From 2e4e5d04ed769a314ab68c45137cc80be30a394c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 8 Sep 2021 09:56:53 +0200
Subject: [PATCH] Improved debug info

---
 .../email/FragmentOptionsEncryption.java      | 22 +++++++++----------
 app/src/main/java/eu/faircode/email/Log.java  |  3 ++-
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
index 965147c7fe..ff0905450e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
@@ -386,23 +386,23 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
 
         try {
             int maxKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength("AES");
-            tvKeySize.setText(getString(R.string.title_advanced_aes_key_size, maxKeySize));
+            tvKeySize.setText(getString(R.string.title_advanced_aes_key_size,
+                    Helper.humanReadableByteCount(maxKeySize)));
         } catch (NoSuchAlgorithmException ex) {
             tvKeySize.setText(Log.formatThrowable(ex));
         }
 
         try {
-            int dp24 = Helper.dp2pixels(getContext(), 24);
-
             SpannableStringBuilder ssb = new SpannableStringBuilder();
-            for (Provider p : Security.getProviders()) {
-                ssb.append(p.toString()).append('\n');
-                //for (Enumeration e = p.keys(); e.hasMoreElements(); ) {
-                //    int start = ssb.length();
-                //    ssb.append(e.nextElement().toString()).append('\n');
-                //    ssb.setSpan(new IndentSpan(dp24), start, ssb.length(), 0);
-                //    ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), start, ssb.length(), 0);
-                //}
+            Provider[] providers = Security.getProviders();
+            for (int p = 0; p < providers.length; p++) {
+                Provider provider = providers[p];
+                ssb.append(Integer.toString(p + 1)).append(' ')
+                        .append(provider.toString()).append('\n');
+                //int start = ssb.length();
+                //for (Enumeration e = provider.keys(); e.hasMoreElements(); )
+                //    ssb.append('-').append(e.nextElement().toString()).append('\n');
+                //ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), start, ssb.length(), 0);
             }
             tvProviders.setText(ssb);
         } catch (Throwable ex) {
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index dbff4ba947..c9f6d91211 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -1773,7 +1773,8 @@ public class Log {
 
         try {
             int maxKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength("AES");
-            sb.append(context.getString(R.string.title_advanced_aes_key_size, maxKeySize)).append("\r\n");
+            sb.append(context.getString(R.string.title_advanced_aes_key_size,
+                    Helper.humanReadableByteCount(maxKeySize))).append("\r\n");
         } catch (Throwable ex) {
             sb.append(ex.toString()).append("\r\n");
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5bff6ccf41..a123a955c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -600,7 +600,7 @@
         This will open to the Android security settings.
         Keys and certificates can generally be found under Advanced - Encryption and credentials.
     </string>
-    <string name="title_advanced_aes_key_size" translatable="false">Max AES key size: %1$d</string>
+    <string name="title_advanced_aes_key_size" translatable="false">Max AES key size: %1$s</string>
 
     <string name="title_advanced_power_menu">Add actions to the Android power menu</string>
     <string name="title_advanced_external_search">Allow other apps to search in messages</string>