Skip to content
Snippets Groups Projects
Unverified Commit bcc47b53 authored by Ann Priestman's avatar Ann Priestman Committed by GitHub
Browse files

Merge pull request #2560 from kellykelly3/8050-remove-web-cookie-end

8050 - Removed Timeline event WEB_COOKIE_END
parents df2f0fb3 5ca7f747
No related branches found
No related tags found
No related merge requests found
......@@ -362,7 +362,6 @@ WebTypes.webDownloads.name=Web Downloads
WebTypes.webCookies.name=Web Cookies Create
WebTypes.webCookiesAccessed.name=Web Cookies Accessed
WebTypes.webCookiesStart.name=Web Cookies Start
WebTypes.webCookiesEnd.name=Web Cookies End
WebTypes.webBookmarks.name=Web Bookmarks
WebTypes.webHistory.name=Web History Accessed
WebTypes.webHistoryCreated.name=Web History Created
......
......@@ -362,7 +362,6 @@ WebTypes.webDownloads.name=Web Downloads
WebTypes.webCookies.name=Web Cookies Create
WebTypes.webCookiesAccessed.name=Web Cookies Accessed
WebTypes.webCookiesStart.name=Web Cookies Start
WebTypes.webCookiesEnd.name=Web Cookies End
WebTypes.webBookmarks.name=Web Bookmarks
WebTypes.webHistory.name=Web History Accessed
WebTypes.webHistoryCreated.name=Web History Created
......
......@@ -212,8 +212,7 @@ public SortedSet< TimelineEventType> getChildren() {
@Override
public SortedSet< TimelineEventType> getChildren() {
return ImmutableSortedSet.of(WEB_DOWNLOADS, WEB_COOKIE,
WEB_COOKIE_ACCESSED,
WEB_COOKIE_END, WEB_BOOKMARK,
WEB_COOKIE_ACCESSED, WEB_BOOKMARK,
WEB_HISTORY, WEB_SEARCH, WEB_FORM_AUTOFILL,
WEB_FORM_ADDRESSES, WEB_FORM_ADDRESSES_MODIFIED,
WEB_FORM_AUTOFILL_ACCESSED, WEB_CACHE, WEB_HISTORY_CREATED);
......@@ -657,12 +656,7 @@ public SortedSet<TimelineEventType> getChildren() {
new Type(TSK_DATETIME_ACCESSED),
new Type(TSK_URL));
TimelineEventType WEB_COOKIE_END = new URLArtifactEventType(42,
getBundle().getString("WebTypes.webCookiesEnd.name"),// NON-NLS
WEB_ACTIVITY,
new BlackboardArtifact.Type(TSK_WEB_COOKIE),
new Type(TSK_DATETIME_END),
new Type(TSK_URL));
// WEB_COOKIE_END was id 42, but has been removed.
TimelineEventType BACKUP_EVENT_START = new TimelineEventArtifactTypeImpl(43,
getBundle().getString("TimelineEventType.BackupEventStart.txt"),// NON-NLS
......
......@@ -118,7 +118,7 @@ public void testArtifactAttributeEvents() {
mapping.put(ARTIFACT_TYPE.TSK_WIFI_NETWORK, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME));
mapping.put(ARTIFACT_TYPE.TSK_WEB_FORM_ADDRESS, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED));
mapping.put(ARTIFACT_TYPE.TSK_METADATA_EXIF, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED));
mapping.put(ARTIFACT_TYPE.TSK_WEB_COOKIE, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, ATTRIBUTE_TYPE.TSK_DATETIME_END));
mapping.put(ARTIFACT_TYPE.TSK_WEB_COOKIE, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED, ATTRIBUTE_TYPE.TSK_DATETIME_CREATED));
mapping.put(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED));
mapping.put(ARTIFACT_TYPE.TSK_TL_EVENT, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME));
mapping.put(ARTIFACT_TYPE.TSK_METADATA, EnumSet.of(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED, ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED, ATTRIBUTE_TYPE.TSK_LAST_PRINTED_DATETIME));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment