From a08f44e6ed45812466ce65073f4392995b7b6ad8 Mon Sep 17 00:00:00 2001 From: KnugiHK <24708955+KnugiHK@users.noreply.github.com> Date: Wed, 23 Aug 2023 16:06:25 +0800 Subject: [PATCH] Fix the potential collision of Whatsapp and Whatsapp Business --- Whatsapp_Chat_Exporter/extract_iphone_media.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Whatsapp_Chat_Exporter/extract_iphone_media.py b/Whatsapp_Chat_Exporter/extract_iphone_media.py index f2ef72c..1cf4f6b 100644 --- a/Whatsapp_Chat_Exporter/extract_iphone_media.py +++ b/Whatsapp_Chat_Exporter/extract_iphone_media.py @@ -20,10 +20,16 @@ def extract_encrypted(base_dir, password, identifiers): backup = EncryptedBackup(backup_directory=base_dir, passphrase=password, cleanup=False, check_same_thread=False) print("Decrypting WhatsApp database...") try: - backup.extract_file(relative_path=RelativePath.WHATSAPP_MESSAGES, - output_filename=identifiers.MESSAGE) - backup.extract_file(relative_path=RelativePath.WHATSAPP_CONTACTS, - output_filename=identifiers.CONTACT) + backup.extract_file( + relative_path=RelativePath.WHATSAPP_MESSAGES, + domain=identifiers.DOMAIN, + output_filename=identifiers.MESSAGE + ) + backup.extract_file( + relative_path=RelativePath.WHATSAPP_CONTACTS, + domain=identifiers.DOMAIN, + output_filename=identifiers.CONTACT + ) except FailedToDecryptError: print("Failed to decrypt backup: incorrect password?") exit()