diff --git a/InternalPythonModules/android/browserlocation.py b/InternalPythonModules/android/browserlocation.py index ab0d52f709..c8c36ecff3 100644 --- a/InternalPythonModules/android/browserlocation.py +++ b/InternalPythonModules/android/browserlocation.py @@ -62,7 +62,7 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer): try: jFile = File(Case.getCurrentCase().getTempDirectory(), str(abstractFile.getId()) + abstractFile.getName()) ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled) - self.__findGeoLocationsInDB(jFile.toString(), abstractFile) + self.__findGeoLocationsInDB(jFile.toString(), abstractFile, context) except Exception as ex: self._logger.log(Level.SEVERE, "Error parsing browser location files", ex) self._logger.log(Level.SEVERE, traceback.format_exc()) @@ -70,7 +70,7 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer): # Error finding browser location files. pass - def __findGeoLocationsInDB(self, databasePath, abstractFile): + def __findGeoLocationsInDB(self, databasePath, abstractFile, context): if not databasePath: return diff --git a/InternalPythonModules/android/cachelocation.py b/InternalPythonModules/android/cachelocation.py index 15879e99b8..4938f930ce 100644 --- a/InternalPythonModules/android/cachelocation.py +++ b/InternalPythonModules/android/cachelocation.py @@ -66,7 +66,7 @@ class CacheLocationAnalyzer(general.AndroidComponentAnalyzer): try: jFile = File(Case.getCurrentCase().getTempDirectory(), str(abstractFile.getId()) + abstractFile.getName()) ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled) - self.__findGeoLocationsInFile(jFile, abstractFile) + self.__findGeoLocationsInFile(jFile, abstractFile, context) except Exception as ex: self._logger.log(Level.SEVERE, "Error parsing cached location files", ex) self._logger.log(Level.SEVERE, traceback.format_exc()) @@ -74,7 +74,7 @@ class CacheLocationAnalyzer(general.AndroidComponentAnalyzer): # Error finding cached location files. pass - def __findGeoLocationsInFile(self, file, abstractFile): + def __findGeoLocationsInFile(self, file, abstractFile, context): try: # code to parse the cache.wifi and cache.cell taken from https://forensics.spreitzenbarth.de/2011/10/28/decoding-cache-cell-and-cache-wifi-files/ diff --git a/InternalPythonModules/android/viber.py b/InternalPythonModules/android/viber.py index 9626f5d285..2aa18cdec1 100644 --- a/InternalPythonModules/android/viber.py +++ b/InternalPythonModules/android/viber.py @@ -92,7 +92,7 @@ class ViberAnalyzer(general.AndroidComponentAnalyzer): helper = CommunicationArtifactsHelper( current_case.getSleuthkitCase(), self._PARSER_NAME, contact_and_calllog_db.getDBFile(), Account.Type.VIBER, context.getJobId()) - self.parse_contacts(contact_and_calllog_db, helper) + self.parse_contacts(contact_and_calllog_db, helper, context) self.parse_calllogs(contact_and_calllog_db, helper) #Extract TSK_MESSAGE information @@ -113,7 +113,7 @@ class ViberAnalyzer(general.AndroidComponentAnalyzer): for contact_and_calllog_db in contact_and_calllog_dbs: contact_and_calllog_db.close() - def parse_contacts(self, contacts_db, helper): + def parse_contacts(self, contacts_db, helper, context): try: contacts_parser = ViberContactsParser(contacts_db) while contacts_parser.next():