diff --git a/mvt/android/modules/bugreport/accessibility.py b/mvt/android/modules/bugreport/accessibility.py index 8c8fe80..52aa47e 100644 --- a/mvt/android/modules/bugreport/accessibility.py +++ b/mvt/android/modules/bugreport/accessibility.py @@ -33,7 +33,7 @@ class Accessibility(BugReportModule): continue def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/activities.py b/mvt/android/modules/bugreport/activities.py index edaf19e..b6aa957 100644 --- a/mvt/android/modules/bugreport/activities.py +++ b/mvt/android/modules/bugreport/activities.py @@ -36,7 +36,7 @@ class Activities(BugReportModule): continue def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/base.py b/mvt/android/modules/bugreport/base.py index 94909a1..590b2d1 100644 --- a/mvt/android/modules/bugreport/base.py +++ b/mvt/android/modules/bugreport/base.py @@ -35,6 +35,12 @@ class BugReportModule(MVTModule): return fnmatch.filter(file_names, pattern) + def _get_files_by_patterns(self, patterns): + for pattern in patterns: + matches = self._get_files_by_pattern(pattern) + if matches: + return matches + def _get_file_content(self, file_path): if self.zip_archive: handle = self.zip_archive.open(file_path) diff --git a/mvt/android/modules/bugreport/battery_daily.py b/mvt/android/modules/bugreport/battery_daily.py index c05d86c..1553a55 100644 --- a/mvt/android/modules/bugreport/battery_daily.py +++ b/mvt/android/modules/bugreport/battery_daily.py @@ -41,7 +41,7 @@ class BatteryDaily(BugReportModule): continue def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/battery_history.py b/mvt/android/modules/bugreport/battery_history.py index d8e19ec..0e7dddb 100644 --- a/mvt/android/modules/bugreport/battery_history.py +++ b/mvt/android/modules/bugreport/battery_history.py @@ -33,7 +33,7 @@ class BatteryHistory(BugReportModule): continue def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/dbinfo.py b/mvt/android/modules/bugreport/dbinfo.py index 28e1078..d00464f 100644 --- a/mvt/android/modules/bugreport/dbinfo.py +++ b/mvt/android/modules/bugreport/dbinfo.py @@ -37,7 +37,7 @@ class DBInfo(BugReportModule): continue def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/getprop.py b/mvt/android/modules/bugreport/getprop.py index 89bf7d5..2a53092 100644 --- a/mvt/android/modules/bugreport/getprop.py +++ b/mvt/android/modules/bugreport/getprop.py @@ -25,7 +25,7 @@ class Getprop(BugReportModule): self.results = {} if not results else results def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/packages.py b/mvt/android/modules/bugreport/packages.py index 1900c9d..356068b 100644 --- a/mvt/android/modules/bugreport/packages.py +++ b/mvt/android/modules/bugreport/packages.py @@ -84,7 +84,7 @@ class Packages(BugReportModule): return results def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return diff --git a/mvt/android/modules/bugreport/receivers.py b/mvt/android/modules/bugreport/receivers.py index 5f89064..05eac87 100644 --- a/mvt/android/modules/bugreport/receivers.py +++ b/mvt/android/modules/bugreport/receivers.py @@ -58,7 +58,7 @@ class Receivers(BugReportModule): continue def run(self): - dumpstate_files = self._get_files_by_pattern("dumpstate-*") + dumpstate_files = self._get_files_by_patterns(["dumpstate-*", "dumpState_*"]) if not dumpstate_files: return