diff --git a/mvt/android/modules/adb/sms.py b/mvt/android/modules/adb/sms.py index bc85265..77e2634 100644 --- a/mvt/android/modules/adb/sms.py +++ b/mvt/android/modules/adb/sms.py @@ -102,15 +102,11 @@ class SMS(AndroidExtraction): log.info("Extracted a total of %d SMS messages containing links", len(self.results)) def run(self): - # Checking the SMS database path - try: - if (self._adb_check_file_exists(os.path.join("/", SMS_BUGLE_PATH))): - self.SMS_DB_TYPE = 1 - self._adb_process_file(os.path.join("/", SMS_BUGLE_PATH), self._parse_db) - elif (self._adb_check_file_exists(os.path.join("/", SMS_MMSSMS_PATH))): - self.SMS_DB_TYPE = 2 - self._adb_process_file(os.path.join("/", SMS_MMSSMS_PATH), self._parse_db) - else: - self.log.error("No SMS database found") - except Exception as e: - self.log.error(e) + if (self._adb_check_file_exists(os.path.join("/", SMS_BUGLE_PATH))): + self.SMS_DB_TYPE = 1 + self._adb_process_file(os.path.join("/", SMS_BUGLE_PATH), self._parse_db) + elif (self._adb_check_file_exists(os.path.join("/", SMS_MMSSMS_PATH))): + self.SMS_DB_TYPE = 2 + self._adb_process_file(os.path.join("/", SMS_MMSSMS_PATH), self._parse_db) + else: + self.log.error("No SMS database found") diff --git a/mvt/android/modules/adb/whatsapp.py b/mvt/android/modules/adb/whatsapp.py index 5c28a7c..e02f892 100644 --- a/mvt/android/modules/adb/whatsapp.py +++ b/mvt/android/modules/adb/whatsapp.py @@ -82,7 +82,4 @@ class Whatsapp(AndroidExtraction): self.results = messages def run(self): - try: - self._adb_process_file(os.path.join("/", WHATSAPP_PATH), self._parse_db) - except Exception as e: - self.log.error(e) + self._adb_process_file(os.path.join("/", WHATSAPP_PATH), self._parse_db)