'#1923: Move repeated code to a printThumb() method.

sepinf-inc · Jan 2, 2024 · 314a724 · 314a724
1 parent aa4975c
commit 314a724
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ReportGenerator.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ReportGenerator.java
@@ -608,11 +608,7 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
                             out.print(format(message.getData()) + "<br/>"); //$NON-NLS-1$
                         }
                         // Some (rare) text messages have thumbs
-                        thumb = message.getThumbData();
-                        if (thumb != null) {
-                            out.print("<img class=\"thumb\" src=\"");
-                            out.print("data:image/jpg;base64," + Util.encodeBase64(thumb) + "\"/>");
-                        }
+                        printThumb(out, message);
                         break;
                     case UNKNOWN_MEDIA_MESSAGE:
                         if (message.getMediaCaption() != null) {
@@ -652,11 +648,7 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
                         }
                         break;
                     case GROUP_INVITE:
-                        thumb = message.getThumbData();
-                        if (thumb != null) {
-                            out.print("<img class=\"thumb\" src=\"");
-                            out.print("data:image/jpg;base64," + Util.encodeBase64(thumb) + "\"/><br/>");
-                        }
+                        printThumb(out, message);
                         out.println("<b><u>" + Messages.getString("WhatsAppReport.GroupInvite") + "</u></b><br/>");
                         if (message.getGroupInviteName() != null) {
                             out.println("<b>" + format(message.getGroupInviteName()) + "</b><br/>");
@@ -666,11 +658,7 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
                         }
                         break;
                     case TEMPLATE_MESSAGE:
-                        thumb = message.getThumbData();
-                        if (thumb != null) {
-                            out.print("<img class=\"thumb\" src=\"");
-                            out.print("data:image/jpg;base64," + Util.encodeBase64(thumb) + "\"/><br/>");
-                        }
+                        printThumb(out, message);
                         if (message.getData() != null) {
                             out.println(format(message.getData()) + "<br/>");
                         }
@@ -693,11 +681,7 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
                         }
                         break;
                     case POLL_MESSAGE:
-                        thumb = message.getThumbData();
-                        if (thumb != null) {
-                            out.print("<img class=\"thumb\" src=\"");
-                            out.print("data:image/jpg;base64," + Util.encodeBase64(thumb) + "\"/><br/>");
-                        }
+                        printThumb(out, message);
                         out.println("<b><u>" + Messages.getString("WhatsAppReport.Poll") + "</u></b><br/>");
                         if (message.getData() != null) {
                             out.println(format(message.getData()) + "<br/>");
@@ -1022,6 +1006,14 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
             out.println("</div><br>");
         }
     }
+
+    private void printThumb(PrintWriter out, Message message) {
+        byte[] thumb = message.getThumbData();
+        if (thumb != null) {
+            out.print("<img class=\"thumb\" src=\"");
+            out.print("data:image/jpg;base64," + Util.encodeBase64(thumb) + "\"/><br/>");
+        }
+    }
 
     private String getBestContactName(Message a, WAContactsDirectory contactsDirectory,WAAccount account){
         String name = null;