mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-08 14:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5575 from sleuthkit/release-4.14.0

Browse Source 
Merge release-4.14.0 branch into develop branch
This commit is contained in:
Richard Cordovano 2020-01-09 15:53:48 -05:00 committed by GitHub
commit f11a6ac526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
InternalPythonModules/android/oruxmaps.py
View File

@ -44,7 +44,7 @@ from org.sleuthkit.datamodel import BlackboardAttribute
from org.sleuthkit.datamodel import Content from org.sleuthkit.datamodel import Content
from org.sleuthkit.datamodel import TskCoreException from org.sleuthkit.datamodel import TskCoreException
from org.sleuthkit.datamodel.Blackboard import BlackboardException from org.sleuthkit.datamodel.Blackboard import BlackboardException
from org.sleuthkit.datamodel.blackboardutils import ArtifactsHelper from org.sleuthkit.datamodel.blackboardutils import GeoArtifactsHelper
import traceback import traceback
import general import general
@ -68,14 +68,14 @@ class OruxMapsAnalyzer(general.AndroidComponentAnalyzer):
for oruxMapsTrackpointsDb in oruxMapsTrackpointsDbs: for oruxMapsTrackpointsDb in oruxMapsTrackpointsDbs:
try: try:
current_case = Case.getCurrentCaseThrows() current_case = Case.getCurrentCaseThrows()
oruxDbHelper = ArtifactsHelper(current_case.getSleuthkitCase(), oruxDbHelper = GeoArtifactsHelper(current_case.getSleuthkitCase(),
self._MODULE_NAME, oruxMapsTrackpointsDb.getDBFile()) self._MODULE_NAME, oruxMapsTrackpointsDb.getDBFile())
poiQueryString = "SELECT poilat, poilon, poitime, poiname FROM pois" poiQueryString = "SELECT poilat, poilon, poitime, poiname FROM pois"
poisResultSet = oruxMapsTrackpointsDb.runQuery(poiQueryString) poisResultSet = oruxMapsTrackpointsDb.runQuery(poiQueryString)
if poisResultSet is not None: if poisResultSet is not None:
while poisResultSet.next(): while poisResultSet.next():
oruxDbHelper.addGPSLocation( oruxDbHelper.addGPSTrackpoint(
poisResultSet.getDouble("poilat"), poisResultSet.getDouble("poilat"),
poisResultSet.getDouble("poilon"), poisResultSet.getDouble("poilon"),
poisResultSet.getLong("poitime") / 1000, # milliseconds since unix epoch poisResultSet.getLong("poitime") / 1000, # milliseconds since unix epoch
@ -86,7 +86,7 @@ class OruxMapsAnalyzer(general.AndroidComponentAnalyzer):
trackpointsResultSet = oruxMapsTrackpointsDb.runQuery(trackpointsQueryString) trackpointsResultSet = oruxMapsTrackpointsDb.runQuery(trackpointsQueryString)
if trackpointsResultSet is not None: if trackpointsResultSet is not None:
while trackpointsResultSet.next(): while trackpointsResultSet.next():
oruxDbHelper.addGPSLocation( oruxDbHelper.addGPSTrackpoint(
trackpointsResultSet.getDouble("trkptlat"), trackpointsResultSet.getDouble("trkptlat"),
trackpointsResultSet.getDouble("trkptlon"), trackpointsResultSet.getDouble("trkptlon"),
trackpointsResultSet.getLong("trkpttime") / 1000, # milliseconds since unix epoch trackpointsResultSet.getLong("trkpttime") / 1000, # milliseconds since unix epoch