From aced1aa74dcb51a8f088cc856fe7ca26f90b4f5d Mon Sep 17 00:00:00 2001 From: Tek Date: Wed, 16 Oct 2024 16:56:06 +0200 Subject: [PATCH] Fixes a bug in Android SMS parsing #526 (#530) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Donncha Ó Cearbhaill --- src/mvt/android/modules/adb/sms.py | 6 ++++-- src/mvt/android/parsers/backup.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mvt/android/modules/adb/sms.py b/src/mvt/android/modules/adb/sms.py index f8aeba35a..63c1de667 100644 --- a/src/mvt/android/modules/adb/sms.py +++ b/src/mvt/android/modules/adb/sms.py @@ -114,8 +114,10 @@ def _parse_db(self, db_path: str) -> None: message["isodate"] = convert_unix_to_iso(message["timestamp"]) # Extract links in the message body - links = check_for_links(message["body"]) - message["links"] = links + body = message.get("body", None) + if body: + links = check_for_links(message["body"]) + message["links"] = links self.results.append(message) diff --git a/src/mvt/android/parsers/backup.py b/src/mvt/android/parsers/backup.py index 2e6bd76af..7c49dedc8 100644 --- a/src/mvt/android/parsers/backup.py +++ b/src/mvt/android/parsers/backup.py @@ -230,7 +230,9 @@ def parse_sms_file(data): entry["body"] = entry["mms_body"] entry.pop("mms_body") - message_links = check_for_links(entry["body"]) + body = entry.get("body", None) + if body: + message_links = check_for_links(entry["body"]) entry["isodate"] = convert_unix_to_iso(int(entry["date"]) / 1000) entry["direction"] = "sent" if int(entry["date_sent"]) else "received"