From 851cd52602daf0de661f03323a2816eb7dad641d Mon Sep 17 00:00:00 2001
From: Nex <nex@nex.sx>
Date: Sun, 30 Jan 2022 16:41:32 +0100
Subject: [PATCH] Ordering and clean-up

---
 mvt/android/modules/adb/__init__.py                | 7 ++++---
 mvt/android/modules/adb/dumpsys_accessibility.py   | 1 -
 mvt/android/modules/adb/dumpsys_battery_daily.py   | 3 +--
 mvt/android/modules/adb/dumpsys_battery_history.py | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mvt/android/modules/adb/__init__.py b/mvt/android/modules/adb/__init__.py
index e5d3fb8..67c5f0a 100644
--- a/mvt/android/modules/adb/__init__.py
+++ b/mvt/android/modules/adb/__init__.py
@@ -6,10 +6,11 @@
 from .chrome_history import ChromeHistory
 from .dumpsys_accessibility import DumpsysAccessibility
 from .dumpsys_activities import DumpsysActivities
+from .dumpsys_battery_daily import DumpsysBatteryDaily
 from .dumpsys_battery_history import DumpsysBatteryHistory
+from .dumpsys_dbinfo import DumpsysDBInfo
 from .dumpsys_full import DumpsysFull
 from .dumpsys_receivers import DumpsysReceivers
-from .dumpsys_battery_daily import DumpsysBatteryDaily
 from .files import Files
 from .getprop import Getprop
 from .logcat import Logcat
@@ -22,5 +23,5 @@ from .whatsapp import Whatsapp
 
 ADB_MODULES = [ChromeHistory, SMS, Whatsapp, Processes, Getprop, Settings,
                DumpsysBatteryHistory, DumpsysBatteryDaily, DumpsysReceivers,
-               DumpsysActivities, DumpsysAccessibility, DumpsysFull,
-               Packages, RootBinaries, Logcat, Files]
+               DumpsysActivities, DumpsysAccessibility, DumpsysDBInfo,
+               DumpsysFull, Packages, RootBinaries, Logcat, Files]
diff --git a/mvt/android/modules/adb/dumpsys_accessibility.py b/mvt/android/modules/adb/dumpsys_accessibility.py
index e3dc232..4ae3b5d 100644
--- a/mvt/android/modules/adb/dumpsys_accessibility.py
+++ b/mvt/android/modules/adb/dumpsys_accessibility.py
@@ -4,7 +4,6 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-import os
 
 from .base import AndroidExtraction
 
diff --git a/mvt/android/modules/adb/dumpsys_battery_daily.py b/mvt/android/modules/adb/dumpsys_battery_daily.py
index 47690a6..431d761 100644
--- a/mvt/android/modules/adb/dumpsys_battery_daily.py
+++ b/mvt/android/modules/adb/dumpsys_battery_daily.py
@@ -4,7 +4,6 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-import os
 
 from .base import AndroidExtraction
 
@@ -24,7 +23,7 @@ class DumpsysBatteryDaily(AndroidExtraction):
         return {
             "timestamp": record["from"],
             "module": self.__class__.__name__,
-            "event": f"battery_daily",
+            "event": "battery_daily",
             "data": f"Recorded update of package {record['package']} with vers {record['vers']}"
         }
 
diff --git a/mvt/android/modules/adb/dumpsys_battery_history.py b/mvt/android/modules/adb/dumpsys_battery_history.py
index 5fd3e9a..0030fef 100644
--- a/mvt/android/modules/adb/dumpsys_battery_history.py
+++ b/mvt/android/modules/adb/dumpsys_battery_history.py
@@ -4,7 +4,6 @@
 #   https://license.mvt.re/1.1/
 
 import logging
-import os
 
 from .base import AndroidExtraction