Merge pull request #6581 from gdicristofaro/7171-nullCoordinates

7171 (0,0) coordinates fix
This commit is contained in:
Richard Cordovano 2020-12-31 14:46:29 -05:00 committed by GitHub
commit 33dc19b4f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions

View File

@ -242,14 +242,14 @@ public class GeolocationSummary implements DefaultArtifactUpdateGovernor {
* the event where either time is null. * the event where either time is null.
* *
* @param minTime The minimum time. If null is provided, this function will * @param minTime The minimum time. If null is provided, this function will
* return true. * return false.
* @param time The time to check. If null is provided and the min time is * @param time The time to check. If null is provided and the min time is
* non-null, then this function will return false. * non-null, then this function will return false.
* @return If minTime == null then true. If minTime != null && time == null * @return If minTime == null then false. If minTime != null && time == null
* then false. Otherwise time >= minTime. * then false. Otherwise time >= minTime.
*/ */
private boolean greaterThanOrEqual(Long minTime, Long time) { private boolean greaterThanOrEqual(Long minTime, Long time) {
if ((minTime == null) || (time != null && time >= minTime)) { if (minTime != null && time != null && time >= minTime) {
return true; return true;
} else { } else {
return false; return false;

View File

@ -43,10 +43,10 @@ PastCasesPanel.notableFileLabel.text=Cases with Common Items That Were Tagged as
PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs
DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected. DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected.
TimelinePanel.activityRangeLabel.text=Activity Range TimelinePanel.activityRangeLabel.text=Activity Range
GeolocationPanel.withinDistanceLabel.text=Locations further than 150Km from a city are not included GeolocationPanel.withinDistanceLabel.text=Locations further than 150km from a city will be listed as 'Unknown'
GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Results GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Artifacts
GeolocationPanel.withinDistanceLabel1.text=Locations further than 150Km from a city are not included GeolocationPanel.withinDistanceLabel1.text=Locations further than 150km from a city will be listed as 'Unknown'
GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Results GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Artifacts
GeolocationPanel.recentViewInGeolocationBtn.text=View in Map GeolocationPanel.recentViewInGeolocationBtn.text=View in Map
GeolocationPanel.commonViewInGeolocationBtn.text=View in Map GeolocationPanel.commonViewInGeolocationBtn.text=View in Map
RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options

View File

@ -110,10 +110,10 @@ PastCasesPanel.notableFileLabel.text=Cases with Common Items That Were Tagged as
PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs PastCasesPanel.sameIdLabel.text=Past Cases with the Same Device IDs
DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected. DataSourceSummaryTabbedPane.noDataSourceLabel.text=No data source has been selected.
TimelinePanel.activityRangeLabel.text=Activity Range TimelinePanel.activityRangeLabel.text=Activity Range
GeolocationPanel.withinDistanceLabel.text=Locations further than 150Km from a city are not included GeolocationPanel.withinDistanceLabel.text=Locations further than 150km from a city will be listed as 'Unknown'
GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Results GeolocationPanel.mostRecentLabel.text=Recent Cities from Geolocation Artifacts
GeolocationPanel.withinDistanceLabel1.text=Locations further than 150Km from a city are not included GeolocationPanel.withinDistanceLabel1.text=Locations further than 150km from a city will be listed as 'Unknown'
GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Results GeolocationPanel.mostCommonLabel.text=Most Common Cities from Geolocation Artifacts
GeolocationPanel.recentViewInGeolocationBtn.text=View in Map GeolocationPanel.recentViewInGeolocationBtn.text=View in Map
GeolocationPanel.commonViewInGeolocationBtn.text=View in Map GeolocationPanel.commonViewInGeolocationBtn.text=View in Map
RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options RecentFilesPanel.rightClickForMoreOptions1.text=Right click on row for more options