🟠🟠 #94: Added support for crypt15/E2E encrypted backups.

Not fully tested, paths for these new files may not be exact.

Author: YuvrajRaghuvanshiS

non_essentials/DATE

@@ -1 +1 @@
-10/03/2022
+21/04/2022

view_extract.py

@@ -222,11 +222,15 @@ def taking_out_main_files(username):
     try:
         tar = tarfile.open(f'{tmp}whatsapp.tar')
         all_tar_files = tar.getnames()
-        files_to_extract = {'key': 'apps/com.whatsapp/f/key',
-                            'msgstore.db': 'apps/com.whatsapp/db/msgstore.db',
-                            'wa.db': 'apps/com.whatsapp/db/wa.db',
-                            'axolotl.db': 'apps/com.whatsapp/db/axolotl.db',
-                            'chatsettings.db': 'apps/com.whatsapp/db/chatsettings.db'}
+        files_to_extract = {
+            'axolotl.db': 'apps/com.whatsapp/db/axolotl.db',
+            'encrypted_backup.key': 'apps/com.whatsapp/f/encrypted_backup.key',
+            'password_data.key': 'apps/com.whatsapp/f/password_data.key',
+            'chatsettings.db': 'apps/com.whatsapp/db/chatsettings.db',
+            'key': 'apps/com.whatsapp/f/key',
+            'msgstore.db': 'apps/com.whatsapp/db/msgstore.db',
+            'wa.db': 'apps/com.whatsapp/db/wa.db',
+        }
 
         for key in files_to_extract:
             if(files_to_extract[key] in all_tar_files):
@@ -235,8 +239,12 @@ def taking_out_main_files(username):
                     f'{tmp}{files_to_extract[key]}', f'{extracted}{username}/{key}')
                 custom_print(f'Copied to \"{extracted}{username}\": {key}')
             else:
-                custom_print(
-                    f'\"{key}\" is not present in tarfile, visit \"https://github.com/YuvrajRaghuvanshiS/WhatsApp-Key-Database-Extractor/issues/73\" for more details.', 'red', ['bold'])
+                if key in ['encrypted_backup.key', 'password_data.key']:
+                    custom_print(
+                        f'\"{key}\" is not present in tarfile, if you have crypt15 backups then visit \"https://github.com/YuvrajRaghuvanshiS/WhatsApp-Key-Database-Extractor/issues/94\" for more details.', 'red', ['bold'])
+                else:
+                    custom_print(
+                        f'\"{key}\" is not present in tarfile, visit \"https://github.com/YuvrajRaghuvanshiS/WhatsApp-Key-Database-Extractor/issues/73\" for more details.', 'red', ['bold'])
         tar.close()
         time.sleep(2)  # So that 'tar' is free to delete.
         try:

wa_kdbe.py

@@ -78,7 +78,7 @@ def main():
     if(is_read_instructions.upper() == 'Y'):
         custom_print('\n', is_get_time=False)
         custom_input(
-            '\aIf you haven\'t already, it is adviced to take a WhatsApp chat backup by going to \"WhatsApp settings \u2192 Chat Settings \u2192 Chat Backup". Hit \"Enter\" key to continue.', 'yellow')
+            '\aIf you haven\'t already, it is advised to take a WhatsApp chat backup by going to \"WhatsApp settings \u2192 Chat Settings \u2192 Chat Backup". Hit \"Enter\" key to continue.', 'yellow')
         usb_mode()
     else:
         kill_me()
@@ -416,7 +416,6 @@ def usb_mode():
     parser.add_argument('-to', '--tar-only', action='store_true',
                         help='Get entire WhatsApp\'s data in \"<username>.tar\" file instead of just getting few important files.')
     args = parser.parse_args()
-    # args = parser.parse_args('--tcp-ip 192.168.43.130 --scrcpy'.split())
 
     is_allowed_reboot = args.allow_reboot
     tcp_ip = args.tcp_ip