crt0mega/mvt
1
0
Fork 0
mirror of https://github.com/mvt-project/mvt.git synced 2024-06-26 14:28:54 +00:00
Code Issues Projects Releases Wiki Activity

Using consistent constant names

Browse Source
This commit is contained in:
Nex 2021-07-30 18:08:52 +02:00
parent 6df6064370
commit 632409c81d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mvt/android/modules/adb/base.py
View File

@ -124,7 +124,7 @@ class AndroidExtraction(MVTModule):
self._adb_connect()
# Check if we have root, if not raise an Exception.
self._adb_root_or_die()
return bool(self._adb_command_as_root(f"[ ! -f {file} ] || echo 1"))
def _adb_download(self, remote_path, local_path, progress_callback=None, retry_root=True):

21
mvt/android/modules/adb/sms.py
View File

@ -13,9 +13,8 @@ from .base import AndroidExtraction
log = logging.getLogger(__name__)
SMS_PATH = "data/data/com.google.android.apps.messaging/databases/bugle_db"
SMS_PATH_2 = "data/data/com.android.providers.telephony/databases/mmssms.db"
sql_command_1 = """
SMS_BUGLE_PATH = "data/data/com.google.android.apps.messaging/databases/bugle_db"
SMS_BUGLE_QUERY = """
SELECT
ppl.normalized_destination AS number,
p.timestamp AS timestamp,
@ -29,7 +28,9 @@ WHERE (m.conversation_id = c._id)
AND (cp.conversation_id = c._id)
AND (cp.participant_id = ppl._id);
"""
sql_command_2 = """
SMS_MMSSMS_PATH = "data/data/com.android.providers.telephony/databases/mmssms.db"
SMS_MMSMS_QUERY = """
SELECT
address AS number,
date_sent AS timestamp,
@ -76,9 +77,9 @@ class SMS(AndroidExtraction):
cur = conn.cursor()
if (self.SMS_DB_TYPE == 1):
cur.execute(sql_command_1)
cur.execute(SMS_BUGLE_QUERY)
elif (self.SMS_DB_TYPE == 2):
cur.execute(sql_command_2)
cur.execute(SMS_MMSMS_QUERY)
names = [description[0] for description in cur.description]
@ -103,12 +104,12 @@ class SMS(AndroidExtraction):
def run(self):
# Checking the SMS database path
try:
if (self._adb_check_file_exists(os.path.join("/", SMS_PATH))):
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_PATH), self._parse_db)
elif (self._adb_check_file_exists(os.path.join("/", SMS_PATH_2))):
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_PATH_2), self._parse_db)
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: