Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace emojis characters by images in the metadata viewer (#1877) #1878

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Replace emojis characters by images in the metadata viewer (#1877) #1878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22207b1
'#1877: Replace emojis characters by images in the metadata viewer.
wladimirleite Sep 14, 2023
6d5934c
'#1877: Remove debug message.
wladimirleite Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion iped-utils/src/main/java/iped/utils/EmojiUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ 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);
return new String(outBytes, StandardCharsets.UTF_8);
}

public static byte[] replaceByImages(byte[] inBytes) {
synchronized (init) {
if (!init.get()) {
Expand Down Expand Up @@ -126,7 +132,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 {
Expand Down
3 changes: 2 additions & 1 deletion iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/MetadataViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down