From 3ec0db1bf82f5bef9438655e005343266eed7354 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 30 Mar 2020 12:04:33 -0400 Subject: [PATCH 1/3] TSK_GPS_TRACK icon --- Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index f623c61c12..1db63007fa 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -154,7 +154,8 @@ public class ExtractedContent implements AutopsyVisitableItem { return filePath + "encrypted-file.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) { return filePath + "mismatch-16.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID()) { + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID() + || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACK.getTypeID()) { return filePath + "gps_trackpoint.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_REMOTE_DRIVE.getTypeID()) { return filePath + "drive_network.png"; //NON-NLS From 0a5bfbc4f9d09c4e2466465bdf2a953b0f76d42d Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 30 Mar 2020 12:06:39 -0400 Subject: [PATCH 2/3] formatting on ExtractedContent --- .../sleuthkit/autopsy/datamodel/ExtractedContent.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 1db63007fa..3329711b43 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -154,8 +154,8 @@ public class ExtractedContent implements AutopsyVisitableItem { return filePath + "encrypted-file.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) { return filePath + "mismatch-16.png"; //NON-NLS - } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID() - || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACK.getTypeID()) { + } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID() + || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID()) { return filePath + "gps_trackpoint.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_REMOTE_DRIVE.getTypeID()) { return filePath + "drive_network.png"; //NON-NLS @@ -244,7 +244,7 @@ public class ExtractedContent implements AutopsyVisitableItem { doNotShow.add(new BlackboardArtifact.Type(TSK_DATA_SOURCE_USAGE)); doNotShow.add(new BlackboardArtifact.Type(TSK_DOWNLOAD_SOURCE)); doNotShow.add(new BlackboardArtifact.Type(TSK_TL_EVENT)); - + //This is not meant to be shown in the UI at all. It is more of a meta artifact. doNotShow.add(new BlackboardArtifact.Type(TSK_ASSOCIATED_OBJECT)); } @@ -511,12 +511,12 @@ public class ExtractedContent implements AutopsyVisitableItem { if (skCase != null) { try { List arts; - if(filteringDSObjId > 0) { + if (filteringDSObjId > 0) { arts = blackboard.getArtifacts(type.getTypeID(), filteringDSObjId); } else { arts = skCase.getBlackboardArtifacts(type.getTypeID()); } - for(BlackboardArtifact art: arts) { + for (BlackboardArtifact art : arts) { //Cache attributes while we are off the EDT. //See JIRA-5969 art.getAttributes(); From 894da9323bf24e5786c6f5bc9a38a3efec0da74f Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 30 Mar 2020 13:27:46 -0400 Subject: [PATCH 3/3] fixed enum --- Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 3329711b43..ac1aace216 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -155,7 +155,7 @@ public class ExtractedContent implements AutopsyVisitableItem { } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EXT_MISMATCH_DETECTED.getTypeID()) { return filePath + "mismatch-16.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID() - || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE.getTypeID()) { + || typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACK.getTypeID()) { return filePath + "gps_trackpoint.png"; //NON-NLS } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_REMOTE_DRIVE.getTypeID()) { return filePath + "drive_network.png"; //NON-NLS