mirror of
https://github.com/elisspace/autopsy.git
synced 2026-10-02 07:19:53 +00:00
Merge branch '5492-refactor-appdbparserhelper' of https://github.com/raman-bt/autopsy into 5419-browsers-maps-apps
This commit is contained in:
@@ -32,9 +32,7 @@ from org.sleuthkit.autopsy.casemodule import Case
|
||||
from org.sleuthkit.autopsy.coreutils import Logger
|
||||
from org.sleuthkit.autopsy.coreutils import MessageNotifyUtil
|
||||
from org.sleuthkit.autopsy.coreutils import AppSQLiteDB
|
||||
from org.sleuthkit.autopsy.coreutils import AppDBParserHelper
|
||||
from org.sleuthkit.autopsy.coreutils.AppDBParserHelper import MessageReadStatusEnum
|
||||
from org.sleuthkit.autopsy.coreutils.AppDBParserHelper import CommunicationDirection
|
||||
|
||||
from org.sleuthkit.autopsy.datamodel import ContentUtils
|
||||
from org.sleuthkit.autopsy.ingest import IngestJobContext
|
||||
from org.sleuthkit.datamodel import AbstractFile
|
||||
@@ -43,6 +41,9 @@ from org.sleuthkit.datamodel import BlackboardAttribute
|
||||
from org.sleuthkit.datamodel import Content
|
||||
from org.sleuthkit.datamodel import TskCoreException
|
||||
from org.sleuthkit.datamodel import Account
|
||||
from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper
|
||||
from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus
|
||||
from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import CommunicationDirection
|
||||
|
||||
import traceback
|
||||
import general
|
||||
@@ -76,7 +77,8 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
|
||||
friendsDbs = AppSQLiteDB.findAppDatabases(dataSource, "imofriends.db", True, "com.imo.android.imous")
|
||||
for friendsDb in friendsDbs:
|
||||
try:
|
||||
friendsDBHelper = AppDBParserHelper("IMO Parser", friendsDb.getDBFile(),
|
||||
friendsDBHelper = CommunicationArtifactsHelper(Case.getCurrentCase().getSleuthkitCase(),
|
||||
"IMO Parser", friendsDb.getDBFile(),
|
||||
Account.Type.IMO, Account.Type.IMO, selfAccountAddress )
|
||||
contactsResultSet = friendsDb.runQuery("SELECT buid, name FROM friends")
|
||||
if contactsResultSet is not None:
|
||||
@@ -108,11 +110,11 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
|
||||
|
||||
message_read = messagesResultSet.getInt("message_read")
|
||||
if (message_read == 1):
|
||||
msgReadStatus = MessageReadStatusEnum.READ
|
||||
msgReadStatus = MessageReadStatus.READ
|
||||
elif (message_read == 0):
|
||||
msgReadStatus = MessageReadStatusEnum.UNREAD
|
||||
msgReadStatus = MessageReadStatus.UNREAD
|
||||
else:
|
||||
msgReadStatus = MessageReadStatusEnum.UNKNOWN
|
||||
msgReadStatus = MessageReadStatus.UNKNOWN
|
||||
|
||||
timeStamp = messagesResultSet.getLong("timestamp") / 1000000000
|
||||
|
||||
@@ -133,9 +135,9 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer):
|
||||
|
||||
|
||||
except SQLException as ex:
|
||||
self._logger.log(Level.SEVERE, "Error processing query result for IMO friends", ex)
|
||||
self._logger.log(Level.WARNING, "Error processing query result for IMO friends", ex)
|
||||
except TskCoreException as ex:
|
||||
self._logger.log(Level.SEVERE, "Failed to create AppDBParserHelper for adding artifacts.", ex)
|
||||
self._logger.log(Level.WARNING, "Failed to create AppDBParserHelper for adding artifacts.", ex)
|
||||
finally:
|
||||
friendsDb.close()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user