From 4c3306c272397457c95aa541583347b8a934666c Mon Sep 17 00:00:00 2001 From: tek Date: Sat, 29 Jan 2022 01:06:32 +0100 Subject: [PATCH] Separate receivers parsing in DumpsysReceivers --- mvt/android/modules/adb/dumpsys_receivers.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mvt/android/modules/adb/dumpsys_receivers.py b/mvt/android/modules/adb/dumpsys_receivers.py index 274f751..f0ec266 100644 --- a/mvt/android/modules/adb/dumpsys_receivers.py +++ b/mvt/android/modules/adb/dumpsys_receivers.py @@ -43,15 +43,12 @@ class DumpsysReceivers(AndroidExtraction): self.log.info("Found a receiver monitoring outgoing calls: \"%s\"", result["receiver"]) - def run(self): - self._adb_connect() - - output = self._adb_command("dumpsys package") - if not output: - return - + def parse_dumpsys_package(self, data): + """ + Parse content of dumpsys package + """ activity = None - for line in output.split("\n"): + for line in data: # Find activity block markers. if line.strip().startswith(INTENT_NEW_OUTGOING_SMS): activity = INTENT_NEW_OUTGOING_SMS @@ -93,4 +90,11 @@ class DumpsysReceivers(AndroidExtraction): "receiver": receiver, }) + def run(self): + self._adb_connect() + + output = self._adb_command("dumpsys package") + if not output: + return + self.parse_dumpsys_package(output.split("\n")) self._adb_disconnect()