From 9fa0c6b0f2b4ab0c68216af245db34bbaf815e6e Mon Sep 17 00:00:00 2001
From: Knugi <24708955+KnugiHK@users.noreply.github.com>
Date: Fri, 25 Feb 2022 09:03:14 +0000
Subject: [PATCH] Updated Android Usage (markdown)

---
 Android-Usage.md | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/Android-Usage.md b/Android-Usage.md
index e8f25aa..cdf5c72 100644
--- a/Android-Usage.md
+++ b/Android-Usage.md
@@ -13,18 +13,42 @@ Simply invoke the following command from shell.
 wtsexporter -a
 ```
 
-## Encrypted Android WhatsApp Backup (crypt14)
+## Encrypted Android WhatsApp Backup (crypt12 or crypt14)
 In order to support the decryption, install pycryptodome if it is not installed
 ```sh
-pip install pycryptodome
+pip install pycryptodome # Or 
+pip install whatsapp-chat-exporter["crypt14"] # install along with this software
 ```
 Place the decryption key file (key) and the encrypted WhatsApp Backup (msgstore.db.crypt14) in the working directory. If you also want the name of your contacts, get the contact database, which is called wa.db. And copy the WhatsApp (Media) directory from your phone directly.
 
 And now, you should have something like this in the working directory.
 
-![Android folder structure with WhatsApp Backup](imgs/android_structure_backup.png)
+![Android folder structure with WhatsApp Backup](https://github.com/KnugiHK/Whatsapp-Chat-Exporter/blob/main/imgs/android_structure_backup.png)
 ### Extracting
 Simply invoke the following command from shell.
 ```sh
 wtsexporter -a -k key -b msgstore.db.crypt14
+```
+
+## Encrypted Android WhatsApp Backup (crypt15)
+In order to support the crypt15 End-to-End Encrypted Backup decryption, install pycryptodome and javaobj-py3 if they not installed
+```sh
+pip install pycryptodome javaobj-py3 # Or 
+pip install whatsapp-chat-exporter["crypt15"] # install along with this software
+```
+Place the encrypted WhatsApp Backup (msgstore.db.crypt15) in the working directory. If you also want the name of your contacts, get the contact database, which is called wa.db. And copy the WhatsApp (Media) directory from your phone directly.
+If you do not have the 32 bytes hex key (64 hexdigits), place the decryption key file (encrypted_backup.key) extracted from Android. If you gave the 32 bytes hex key, simply put the key in the shell.
+
+Now, you should have something like this in the working directory (if you do not have 32 bytes hex key).
+
+![Android folder structure with WhatsApp Backup](https://github.com/KnugiHK/Whatsapp-Chat-Exporter/blob/main/imgs/android_structure_backup_crypt15.png)
+### Extracting
+If you do not have 32 bytes hex key but have the key file available, simply invoke the following command from shell.
+```sh
+wtsexporter -a -k encrypted_backup.key -b msgstore.db.crypt15
+```
+If you have the 32 bytes hex key, simply put the hex key in the -k option and invoke the command from shell like this:
+```sh
+wtsexporter -a -k 432435053b5204b08e5c3823423399aa30ff061435ab89bc4e6713969cdaa5a8 -b msgstore.db.crypt15
+```
 ```
\ No newline at end of file