From ba16b871e36a6626304196865c3a9d6c1a8d12cf Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 28 Nov 2023 11:48:45 +0100
Subject: [PATCH] Small improvements

---
 .../eu/faircode/email/StructuredEmail.java    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/StructuredEmail.java b/app/src/main/java/eu/faircode/email/StructuredEmail.java
index b26974901d..0807dab734 100644
--- a/app/src/main/java/eu/faircode/email/StructuredEmail.java
+++ b/app/src/main/java/eu/faircode/email/StructuredEmail.java
@@ -20,8 +20,6 @@ package eu.faircode.email;
 */
 
 import android.content.Context;
-import android.net.Uri;
-import android.text.TextUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -74,13 +72,13 @@ public class StructuredEmail {
                     continue;
                 Object v = (jobject.isNull(key) ? "" : jobject.get(key));
                 if (v instanceof JSONObject || v instanceof JSONArray) {
-                    sb.append(split(key))
+                    sb.append(unCamelCase(key))
                             .append(':')
                             .append('\n');
                     getHtml(v, indent + 1, sb);
                 } else {
                     sb.append(indent(indent))
-                            .append(split(key))
+                            .append(unCamelCase(key))
                             .append(": ")
                             .append(v)
                             .append('\n');
@@ -97,19 +95,27 @@ public class StructuredEmail {
         }
     }
 
-    private String split(String key) {
+    private static String unCamelCase(String key) {
+        boolean split = false;
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < key.length(); i++) {
             char kar = key.charAt(i);
-            if (Character.isUpperCase(kar))
-                sb.append(' ').append(Character.toLowerCase(kar));
-            else
+            if (Character.isUpperCase(kar)) {
+                if (split)
+                    sb.append(kar);
+                else {
+                    split = true;
+                    sb.append(' ').append(Character.toLowerCase(kar));
+                }
+            } else {
+                split = false;
                 sb.append(kar);
+            }
         }
         return sb.toString();
     }
 
-    private String indent(int count) {
+    private static String indent(int count) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < count; i++)
             sb.append("  ");