diff --git a/bindings/java/doxygen/artifact_catalog.dox b/bindings/java/doxygen/artifact_catalog.dox
index f1c78afaf6d81f3cedd9b42047a40265a199d800..8549dce2c2bc730629e1c1c4777d55f8265b1dfa 100644
--- a/bindings/java/doxygen/artifact_catalog.dox
+++ b/bindings/java/doxygen/artifact_catalog.dox
@@ -184,8 +184,6 @@ Details about System/aplication/file backups.
### REQUIRED ATTRIBUTES
- TSK_DATETIME_START (Date/Time the backup happened)
- or
- TSK_DATETIME
### OPTIONAL ATTRIBUTES
- TSK_DATETIME_END (Date/Time the backup ended)
@@ -675,8 +673,6 @@ Activity on the system or from an application. Example usage is a mobile device
### REQUIRED ATTRIBUTES
- TSK_DATETIME_START (When activity started)
- or
- TSK_DATETIME
### OPTIONAL ATTRIBUTES
- TSK_ACTIVITY_TYPE (Activity type i.e.: On or Off)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index e1f5ca28389ec16e20b7c73775c1b5541d68fd60..c3087fc6f2506c0d363ec285cff0aad732f76ebe 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -331,7 +331,7 @@ FileSystemTypes.fileChanged.name=File Changed
MiscTypes.message.name=Messages
MiscTypes.GPSRoutes.name=GPS Routes
MiscTypes.GPSTrackpoint.name=GPS Trackpoint
-MiscTypes.Calls.name=Call Start
+MiscTypes.Calls.name=Call Begin
MiscTypes.CallsEnd.name=Call End
MiscTypes.Email.name=Email Sent
MiscTypes.EmailRcvd.name=Email Received
@@ -404,15 +404,13 @@ Significance.LikelyNone.displayName.text=Likely Not Notable
Significance.LikelyNotable.displayName.text=Likely Notable
Significance.None.displayName.text=Not Notable
Significance.Notable.displayName.text=Notable
-TimelineEventType.BackupEvent.txt=Backup Event
-TimelineEventType.BackupEventStart.txt=Backup Event Start
-TimelineEventType.BackupEventEnd.txt=Backup Event End
-TimelineEventType.BackupEvent.description=Backup Event
-TimelineEventType.BackupEvent.description.start=Backup Event Started
-TimelineEventType.BackupEvent.description.end=Backup Event Ended
+TimelineEventType.BackupEventStart.txt=Backup Begin
+TimelineEventType.BackupEventEnd.txt=Backup End
+TimelineEventType.BackupEvent.description.start=Backup Begin
+TimelineEventType.BackupEvent.description.end=Backup End
TimelineEventType.BluetoothPairingLastConnection.txt=Bluetooth Pairing Last Connection
TimelineEventType.BluetoothPairing.txt=Bluetooth Pairing
-TimelineEventType.CalendarEntryStart.txt=Calendar Entry Start
+TimelineEventType.CalendarEntryStart.txt=Calendar Entry Begin
TimelineEventType.CalendarEntryEnd.txt=Calendar Entry End
TimelineEventType.DeletedProgram.txt=Program Deleted
TimelineEventType.DeletedProgramDeleted.txt=Application Deleted
@@ -423,9 +421,8 @@ TimelineEventType.OSAccountPwdReset.txt=Operating System Account Password Reset
TimelineEventType.OSInfo.txt=Operating System Information
TimelineEventType.ProgramNotification.txt=Program Notification
TimelineEventType.ScreenShot.txt=Screen Shot
-TimelineEventType.UserDeviceEvent.txt=User Device Event
-TimelineEventType.UserDeviceEventStart.txt=User Device Event Start
-TimelineEventType.UserDeviceEventEnd.txt=User Device Event End
+TimelineEventType.UserDeviceEventStart.txt=User Activity Begin
+TimelineEventType.UserDeviceEventEnd.txt=User Activity End
TimelineEventType.ServiceAccount.txt=Service Account
TimelineEventType.WIFINetwork.txt=Wifi Network
TimelineEventType.WebCache.text=Web Cache
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
index ee66b0f038c997aee6fece69e3e4a7dd3a5724d4..c3087fc6f2506c0d363ec285cff0aad732f76ebe 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -331,7 +331,7 @@ FileSystemTypes.fileChanged.name=File Changed
MiscTypes.message.name=Messages
MiscTypes.GPSRoutes.name=GPS Routes
MiscTypes.GPSTrackpoint.name=GPS Trackpoint
-MiscTypes.Calls.name=Call Start
+MiscTypes.Calls.name=Call Begin
MiscTypes.CallsEnd.name=Call End
MiscTypes.Email.name=Email Sent
MiscTypes.EmailRcvd.name=Email Received
@@ -404,15 +404,13 @@ Significance.LikelyNone.displayName.text=Likely Not Notable
Significance.LikelyNotable.displayName.text=Likely Notable
Significance.None.displayName.text=Not Notable
Significance.Notable.displayName.text=Notable
-TimelineEventType.BackupEvent.txt=Backup Event
-TimelineEventType.BackupEventStart.txt=Backup Event Start
-TimelineEventType.BackupEventEnd.txt=Backup Event End
-TimelineEventType.BackupEvent.description=Backup Event
-TimelineEventType.BackupEvent.description.start=Backup Event Started
-TimelineEventType.BackupEvent.description.end=Backup Event Ended
+TimelineEventType.BackupEventStart.txt=Backup Begin
+TimelineEventType.BackupEventEnd.txt=Backup End
+TimelineEventType.BackupEvent.description.start=Backup Begin
+TimelineEventType.BackupEvent.description.end=Backup End
TimelineEventType.BluetoothPairingLastConnection.txt=Bluetooth Pairing Last Connection
TimelineEventType.BluetoothPairing.txt=Bluetooth Pairing
-TimelineEventType.CalendarEntryStart.txt=Calendar Entry Start
+TimelineEventType.CalendarEntryStart.txt=Calendar Entry Begin
TimelineEventType.CalendarEntryEnd.txt=Calendar Entry End
TimelineEventType.DeletedProgram.txt=Program Deleted
TimelineEventType.DeletedProgramDeleted.txt=Application Deleted
@@ -423,13 +421,11 @@ TimelineEventType.OSAccountPwdReset.txt=Operating System Account Password Reset
TimelineEventType.OSInfo.txt=Operating System Information
TimelineEventType.ProgramNotification.txt=Program Notification
TimelineEventType.ScreenShot.txt=Screen Shot
-TimelineEventType.UserDeviceEvent.txt=User Device Event
-TimelineEventType.UserDeviceEventStart.txt=User Device Event Start
-TimelineEventType.UserDeviceEventEnd.txt=User Device Event End
+TimelineEventType.UserDeviceEventStart.txt=User Activity Begin
+TimelineEventType.UserDeviceEventEnd.txt=User Activity End
TimelineEventType.ServiceAccount.txt=Service Account
TimelineEventType.WIFINetwork.txt=Wifi Network
TimelineEventType.WebCache.text=Web Cache
-TimelineEventType.InstalledProgram.txt=Program Installed
TimelineEventType.BluetoothAdapter.txt=Bluetooth Adapter
BaseTypes.geolocation.name=Geolocation
BaseTypes.communication.name=Communication
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java
index 7c985e94696d41c10c378fd3d36332dabb0e971e..2d7c98265b8b3cd6c24b30943cc7633d2552b82a 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventType.java
@@ -229,10 +229,10 @@ public int compare(TimelineEventType o1, TimelineEventType o2) {
EXIF, GPS_BOOKMARK, GPS_LAST_KNOWN_LOCATION, GPS_TRACKPOINT,
GPS_ROUTE, GPS_SEARCH, GPS_TRACK, INSTALLED_PROGRAM, LOG_ENTRY, MESSAGE,
METADATA_LAST_PRINTED, METADATA_LAST_SAVED, METADATA_CREATED, PROGRAM_EXECUTION,
- RECENT_DOCUMENTS, REGISTRY, BACKUP_EVENT_START, BACKUP_EVENT, BACKUP_EVENT_END,
+ RECENT_DOCUMENTS, REGISTRY, BACKUP_EVENT_START, BACKUP_EVENT_END,
BLUETOOTH_PAIRING, CALENDAR_ENTRY_START, CALENDAR_ENTRY_END,
PROGRAM_DELETED,
- OS_INFO, WIFI_NETWORK, USER_DEVICE_EVENT, USER_DEVICE_EVENT_START, USER_DEVICE_EVENT_END,
+ OS_INFO, WIFI_NETWORK, USER_DEVICE_EVENT_START, USER_DEVICE_EVENT_END,
SERVICE_ACCOUNT, SCREEN_SHOT, PROGRAM_NOTIFICATION,
BLUETOOTH_PAIRING_ACCESSED, BLUETOOTH_ADAPTER);
@@ -674,18 +674,7 @@ public SortedSet< TimelineEventType> getChildren() {
new EmptyExtractor(),
new EmptyExtractor());
- TimelineEventType BACKUP_EVENT = new TimelineEventArtifactTypeImpl(44,
- getBundle().getString("TimelineEventType.BackupEvent.txt"),// NON-NLS
- MISC_TYPES,
- new BlackboardArtifact.Type(TSK_BACKUP_EVENT),
- new BlackboardAttribute.Type(TSK_DATETIME),
- artf -> {
- return getBundle().getString("TimelineEventType.BackupEvent.description");
- },
- new EmptyExtractor(),
- new EmptyExtractor());
-
- TimelineEventType BACKUP_EVENT_END = new TimelineEventArtifactTypeImpl(45,
+ TimelineEventType BACKUP_EVENT_END = new TimelineEventArtifactTypeImpl(44,
getBundle().getString("TimelineEventType.BackupEventEnd.txt"),// NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_BACKUP_EVENT),
@@ -696,56 +685,56 @@ public SortedSet< TimelineEventType> getChildren() {
new EmptyExtractor(),
new EmptyExtractor());
- TimelineEventType BLUETOOTH_PAIRING = new TimelineEventArtifactTypeSingleDescription(46,
+ TimelineEventType BLUETOOTH_PAIRING = new TimelineEventArtifactTypeSingleDescription(45,
getBundle().getString("TimelineEventType.BluetoothPairing.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_BLUETOOTH_PAIRING),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_DEVICE_NAME));
- TimelineEventType CALENDAR_ENTRY_START = new TimelineEventArtifactTypeSingleDescription(47,
+ TimelineEventType CALENDAR_ENTRY_START = new TimelineEventArtifactTypeSingleDescription(46,
getBundle().getString("TimelineEventType.CalendarEntryStart.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_CALENDAR_ENTRY),
new BlackboardAttribute.Type(TSK_DATETIME_START),
new BlackboardAttribute.Type(TSK_DESCRIPTION));
- TimelineEventType CALENDAR_ENTRY_END = new TimelineEventArtifactTypeSingleDescription(48,
+ TimelineEventType CALENDAR_ENTRY_END = new TimelineEventArtifactTypeSingleDescription(47,
getBundle().getString("TimelineEventType.CalendarEntryEnd.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_CALENDAR_ENTRY),
new BlackboardAttribute.Type(TSK_DATETIME_END),
new BlackboardAttribute.Type(TSK_DESCRIPTION));
- TimelineEventType PROGRAM_DELETED = new TimelineEventArtifactTypeSingleDescription(49,
+ TimelineEventType PROGRAM_DELETED = new TimelineEventArtifactTypeSingleDescription(48,
getBundle().getString("TimelineEventType.DeletedProgram.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_DELETED_PROG),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_PROG_NAME));
- TimelineEventType OS_INFO = new TimelineEventArtifactTypeSingleDescription(50,
+ TimelineEventType OS_INFO = new TimelineEventArtifactTypeSingleDescription(49,
getBundle().getString("TimelineEventType.OSInfo.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_OS_INFO),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_PROG_NAME));
- TimelineEventType PROGRAM_NOTIFICATION = new TimelineEventArtifactTypeSingleDescription(51,
+ TimelineEventType PROGRAM_NOTIFICATION = new TimelineEventArtifactTypeSingleDescription(50,
getBundle().getString("TimelineEventType.ProgramNotification.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_PROG_NOTIFICATIONS),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_PROG_NAME));
- TimelineEventType SCREEN_SHOT = new TimelineEventArtifactTypeSingleDescription(52,
+ TimelineEventType SCREEN_SHOT = new TimelineEventArtifactTypeSingleDescription(51,
getBundle().getString("TimelineEventType.ScreenShot.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_SCREEN_SHOTS),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_PROG_NAME));
- TimelineEventType SERVICE_ACCOUNT = new TimelineEventArtifactTypeImpl(53,
+ TimelineEventType SERVICE_ACCOUNT = new TimelineEventArtifactTypeImpl(52,
getBundle().getString("TimelineEventType.ServiceAccount.txt"),// NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_SERVICE_ACCOUNT),
@@ -758,21 +747,7 @@ public SortedSet< TimelineEventType> getChildren() {
new EmptyExtractor(),
new EmptyExtractor());
- TimelineEventType USER_DEVICE_EVENT = new TimelineEventArtifactTypeImpl(54,
- getBundle().getString("TimelineEventType.UserDeviceEvent.txt"),// NON-NLS
- MISC_TYPES,
- new BlackboardArtifact.Type(TSK_USER_DEVICE_EVENT),
- new BlackboardAttribute.Type(TSK_DATETIME),
- artf -> {
- String progName = stringValueOf(getAttributeSafe(artf, new Type(TSK_PROG_NAME)));
- String activityType = stringValueOf(getAttributeSafe(artf, new Type(TSK_ACTIVITY_TYPE)));
- String connectionType = stringValueOf(getAttributeSafe(artf, new Type(TSK_VALUE)));
- return String.format("Program Name: %s Activity Type: %s Connection Type: %s", progName, activityType, connectionType);
- },
- new EmptyExtractor(),
- new EmptyExtractor());
-
- TimelineEventType USER_DEVICE_EVENT_START = new TimelineEventArtifactTypeImpl(55,
+ TimelineEventType USER_DEVICE_EVENT_START = new TimelineEventArtifactTypeImpl(53,
getBundle().getString("TimelineEventType.UserDeviceEventStart.txt"),// NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_USER_DEVICE_EVENT),
@@ -786,7 +761,7 @@ public SortedSet< TimelineEventType> getChildren() {
new EmptyExtractor(),
new EmptyExtractor());
- TimelineEventType USER_DEVICE_EVENT_END = new TimelineEventArtifactTypeImpl(56,
+ TimelineEventType USER_DEVICE_EVENT_END = new TimelineEventArtifactTypeImpl(54,
getBundle().getString("TimelineEventType.UserDeviceEventEnd.txt"),// NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_USER_DEVICE_EVENT),
@@ -800,35 +775,35 @@ public SortedSet< TimelineEventType> getChildren() {
new EmptyExtractor(),
new EmptyExtractor());
- TimelineEventType WEB_CACHE = new URLArtifactEventType(57,
+ TimelineEventType WEB_CACHE = new URLArtifactEventType(55,
getBundle().getString("TimelineEventType.WebCache.text"),// NON-NLS
WEB_ACTIVITY,
new BlackboardArtifact.Type(TSK_WEB_CACHE),
new Type(TSK_DATETIME_CREATED),
new Type(TSK_URL));
- TimelineEventType WIFI_NETWORK = new TimelineEventArtifactTypeSingleDescription(58,
+ TimelineEventType WIFI_NETWORK = new TimelineEventArtifactTypeSingleDescription(56,
getBundle().getString("TimelineEventType.WIFINetwork.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_WIFI_NETWORK),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_SSID));
- TimelineEventType WEB_HISTORY_CREATED = new URLArtifactEventType(59,
+ TimelineEventType WEB_HISTORY_CREATED = new URLArtifactEventType(57,
getBundle().getString("WebTypes.webHistoryCreated.name"),// NON-NLS
WEB_ACTIVITY,
new BlackboardArtifact.Type(TSK_WEB_HISTORY),
new Type(TSK_DATETIME_CREATED),
new Type(TSK_URL));
- TimelineEventType BLUETOOTH_ADAPTER = new TimelineEventArtifactTypeSingleDescription(60,
+ TimelineEventType BLUETOOTH_ADAPTER = new TimelineEventArtifactTypeSingleDescription(58,
getBundle().getString("TimelineEventType.BluetoothAdapter.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_BLUETOOTH_ADAPTER),
new BlackboardAttribute.Type(TSK_DATETIME),
new BlackboardAttribute.Type(TSK_NAME));
- TimelineEventType BLUETOOTH_PAIRING_ACCESSED = new TimelineEventArtifactTypeSingleDescription(61,
+ TimelineEventType BLUETOOTH_PAIRING_ACCESSED = new TimelineEventArtifactTypeSingleDescription(59,
getBundle().getString("TimelineEventType.BluetoothPairingLastConnection.txt"),//NON-NLS
MISC_TYPES,
new BlackboardArtifact.Type(TSK_BLUETOOTH_PAIRING),