diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java index 456f9f3bf6..b6c06ee5d9 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java @@ -104,6 +104,14 @@ public class ArtifactTypeNode extends DisplayableItemNode { return "searchquery.png"; case TSK_METADATA_EXIF: return "camera-icon-16.png"; + case TSK_CONTACT: + return "contact.png"; + case TSK_MESSAGE: + return "message.png"; + case TSK_CALLLOG: + return "calllog.png"; + case TSK_CALENDAR_ENTRY: + return "calendar.png"; } return "artifact-icon.png"; } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java index 280ca2c6eb..14bfd45f35 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java @@ -287,6 +287,14 @@ public class BlackboardArtifactNode extends DisplayableItemNode { return "green-tag-icon-16.png"; case TSK_METADATA_EXIF: return "camera-icon-16.png"; + case TSK_CONTACT: + return "contact.png"; + case TSK_MESSAGE: + return "message.png"; + case TSK_CALLLOG: + return "calllog.png"; + case TSK_CALENDAR_ENTRY: + return "calendar.png"; } return "artifact-icon.png"; } diff --git a/Core/src/org/sleuthkit/autopsy/images/calendar.png b/Core/src/org/sleuthkit/autopsy/images/calendar.png new file mode 100644 index 0000000000..4c0f910f06 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/calendar.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/calllog.png b/Core/src/org/sleuthkit/autopsy/images/calllog.png new file mode 100644 index 0000000000..83eb9c448d Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/calllog.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/contact.png b/Core/src/org/sleuthkit/autopsy/images/contact.png new file mode 100644 index 0000000000..1df468ef0a Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/contact.png differ diff --git a/Core/src/org/sleuthkit/autopsy/images/message.png b/Core/src/org/sleuthkit/autopsy/images/message.png new file mode 100644 index 0000000000..6223516e3e Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/images/message.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 7c2af55280..81bf63649f 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -561,6 +561,32 @@ public class ReportHTML implements TableReportModule { FileUtil.copy(in, output); in.close(); output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/contact.png"); + output = new FileOutputStream(new File(path + File.separator + "Contacts.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/message.png"); + output = new FileOutputStream(new File(path + File.separator + "Messages.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/calllog.png"); + output = new FileOutputStream(new File(path + File.separator + "Call Logs.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + in = getClass().getResourceAsStream("/org/sleuthkit/autopsy/report/images/calendar.png"); + output = new FileOutputStream(new File(path + File.separator + "Calendar Entries.png")); + FileUtil.copy(in, output); + in.close(); + output.close(); + + } catch (IOException ex) { logger.log(Level.SEVERE, "Failed to extract images for HTML report.", ex); } finally { diff --git a/Core/src/org/sleuthkit/autopsy/report/images/calendar.png b/Core/src/org/sleuthkit/autopsy/report/images/calendar.png new file mode 100644 index 0000000000..4c0f910f06 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/calendar.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/calllog.png b/Core/src/org/sleuthkit/autopsy/report/images/calllog.png new file mode 100644 index 0000000000..83eb9c448d Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/calllog.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/contact.png b/Core/src/org/sleuthkit/autopsy/report/images/contact.png new file mode 100644 index 0000000000..1df468ef0a Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/contact.png differ diff --git a/Core/src/org/sleuthkit/autopsy/report/images/message.png b/Core/src/org/sleuthkit/autopsy/report/images/message.png new file mode 100644 index 0000000000..6223516e3e Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/report/images/message.png differ