From f2b8b7775efb71cdc873bf89409851ac6c3be888 Mon Sep 17 00:00:00 2001 From: Raman Date: Thu, 19 Sep 2019 06:38:51 -0400 Subject: [PATCH] Syncing Xender/Zapya/ShareIt modlues to the latest artifacts helper api definition. --- InternalPythonModules/android/imo.py | 2 +- InternalPythonModules/android/shareit.py | 5 +++-- InternalPythonModules/android/xender.py | 5 +++-- InternalPythonModules/android/zapya.py | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/InternalPythonModules/android/imo.py b/InternalPythonModules/android/imo.py index 5a653ff9d5..aed3b4011c 100644 --- a/InternalPythonModules/android/imo.py +++ b/InternalPythonModules/android/imo.py @@ -138,7 +138,7 @@ class IMOAnalyzer(general.AndroidComponentAnalyzer): except SQLException as ex: self._logger.log(Level.WARNING, "Error processing query result for IMO friends", ex) except (TskCoreException, BlackboardException) as ex: - self._logger.log(Level.WARNING, "Failed to message artifacts.", ex) + self._logger.log(Level.WARNING, "Failed to create IMO message artifacts.", ex) finally: friendsDb.close() diff --git a/InternalPythonModules/android/shareit.py b/InternalPythonModules/android/shareit.py index ac359f51a3..8e3ebd3823 100644 --- a/InternalPythonModules/android/shareit.py +++ b/InternalPythonModules/android/shareit.py @@ -39,6 +39,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact from org.sleuthkit.datamodel import BlackboardAttribute from org.sleuthkit.datamodel import Content from org.sleuthkit.datamodel import TskCoreException +from org.sleuthkit.datamodel.Blackboard import BlackboardException from org.sleuthkit.datamodel import Account from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus @@ -102,8 +103,8 @@ class ShareItAnalyzer(general.AndroidComponentAnalyzer): except SQLException as ex: self._logger.log(Level.WARNING, "Error processing query result for ShareIt history.", ex) - except TskCoreException as ex: - self._logger.log(Level.WARNING, "Failed to create CommunicationArtifactsHelper for adding artifacts.", ex) + except (TskCoreException, BlackboardException) as ex: + self._logger.log(Level.WARNING, "Failed to create ShareIt message artifacts.", ex) finally: historyDb.close() diff --git a/InternalPythonModules/android/xender.py b/InternalPythonModules/android/xender.py index b59f18dce3..d1cecd3a82 100644 --- a/InternalPythonModules/android/xender.py +++ b/InternalPythonModules/android/xender.py @@ -39,6 +39,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact from org.sleuthkit.datamodel import BlackboardAttribute from org.sleuthkit.datamodel import Content from org.sleuthkit.datamodel import TskCoreException +from org.sleuthkit.datamodel.Blackboard import BlackboardException from org.sleuthkit.datamodel import Account from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus @@ -109,8 +110,8 @@ class XenderAnalyzer(general.AndroidComponentAnalyzer): except SQLException as ex: self._logger.log(Level.WARNING, "Error processing query result for profiles", ex) - except TskCoreException as ex: - self._logger.log(Level.WARNING, "Failed to create CommunicationArtifactsHelper for adding artifacts.", ex) + except (TskCoreException, BlackboardException) as ex: + self._logger.log(Level.WARNING, "Failed to create Xender message artifacts.", ex) finally: transactionDb.close() diff --git a/InternalPythonModules/android/zapya.py b/InternalPythonModules/android/zapya.py index fed51dd27d..9bcb5753d1 100644 --- a/InternalPythonModules/android/zapya.py +++ b/InternalPythonModules/android/zapya.py @@ -39,6 +39,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact from org.sleuthkit.datamodel import BlackboardAttribute from org.sleuthkit.datamodel import Content from org.sleuthkit.datamodel import TskCoreException +from org.sleuthkit.datamodel.Blackboard import BlackboardException from org.sleuthkit.datamodel import Account from org.sleuthkit.datamodel.blackboardutils import CommunicationArtifactsHelper from org.sleuthkit.datamodel.blackboardutils.CommunicationArtifactsHelper import MessageReadStatus @@ -102,8 +103,8 @@ class ZapyaAnalyzer(general.AndroidComponentAnalyzer): except SQLException as ex: self._logger.log(Level.WARNING, "Error processing query result for transfer", ex) - except TskCoreException as ex: - self._logger.log(Level.WARNING, "Failed to create CommunicationArtifactsHelper for adding artifacts.", ex) + except (TskCoreException, BlackboardException) as ex: + self._logger.log(Level.WARNING, "Failed to create Zapya message artifacts.", ex) finally: transferDb.close()