'#1877: Replace emojis characters by images in the metadata viewer.

sepinf-inc · Sep 14, 2023 · 22207b1 · 22207b1
1 parent ef18f22
commit 22207b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/iped-utils/src/main/java/iped/utils/EmojiUtil.java b/iped-utils/src/main/java/iped/utils/EmojiUtil.java
@@ -22,6 +22,14 @@ public class EmojiUtil {
     private static final Map<String, String> base64ImagesPerCode = new HashMap<String, String>();
     private static final AtomicBoolean init = new AtomicBoolean();
 
+    public static String replaceByImages(String inStr) {
+        byte[] inBytes = inStr.getBytes(StandardCharsets.UTF_8);
+        byte[] outBytes = replaceByImages(inBytes);
+        String ret = new String(outBytes, StandardCharsets.UTF_8);
+        System.err.println(ret);
+        return ret;
+    }
+
     public static byte[] replaceByImages(byte[] inBytes) {
         synchronized (init) {
             if (!init.get()) {
@@ -126,7 +134,7 @@ public static byte[] replaceByImages(byte[] inBytes) {
                         }
                     } else if (!bodyFound) {
                         out.println(s);
-                        if (s.indexOf("<body>") >= 0) {
+                        if (s.indexOf("<body") >= 0) {
                             bodyFound = true;
                         }
                     } else {

diff --git a/iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/MetadataViewer.java b/iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/MetadataViewer.java
@@ -27,6 +27,7 @@
 import iped.properties.BasicProps;
 import iped.properties.ExtraProperties;
 import iped.properties.MediaTypes;
+import iped.utils.EmojiUtil;
 import iped.utils.LocalizedFormat;
 import iped.utils.SimpleHTMLEncoder;
 import iped.utils.UiUtil;
@@ -229,7 +230,7 @@ private String generatePreview(IItemReader item, int tabIndex) {
         sb.append("</body>"); //$NON-NLS-1$
         sb.append("</html>"); //$NON-NLS-1$
 
-        return sb.toString();
+        return EmojiUtil.replaceByImages(sb.toString());
     }
 
     private void fillMetadata(StringBuilder sb, Metadata metadata) {