Error=BadAuthentication

.gitignore

@@ -0,0 +1,164 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# Whatsapp extractor
+*/*
+md5sum.txt

README.md

@@ -1,32 +1,56 @@
-# WhatsApp Google Drive Extractor
-Allows WhatsApp users on Android to extract their backed up WhatsApp data from Google Drive.  
+WhatsApp Google Drive Extractor
+===============================
 
-###### BRANCH UPDATES:
-v1.0 - Initial release.  
-v1.1 - Added Python 3 support.  
+Allows WhatsApp users on Android to extract their backed up WhatsApp data
+from Google Drive.
 
 
-###### PREREQUISITES:
- 1. O/S: Windows Vista, Windows 7, Windows 8, Windows 10, Mac OS X or Linux  
- 2. Python 2.x or 3.x - If not installed: https://www.python.org/downloads/  
- 3. Android device with WhatsApp installed and the Google Drive backup feature enabled  
- 4. Google services device id (if you want to reduce the risk of being logged out of Google)  
-     Search Google Play for "device id" for plenty of apps that can reveal this information  
- 5. Google account login credentials (username and password)  
+Prerequisites
+-------------
 
+ 1. [Python 3][PYTHON]
+ 2. Android device with WhatsApp installed and the Google Drive backup
+    feature enabled.
+ 3. The device's Android ID (if you want to reduce the risk of being logged
+    out of Google). Run `adb shell settings get secure android_id` or Search Google Play for "device id" for plenty of apps
+    that can reveal this information.
+ 4. Google account login credentials (username and password). Create and use an App password when using 2-factor authentication: https://myaccount.google.com/apppasswords
 
-###### INSTRUCTIONS:
- 1. Extract "WhatsApp-GD-Extractor-master.zip".  
- 2. Edit the [auth] section in "settings.cfg".  
- 3. Run python WhatsAppGDExtract.py from your command console.  
- 4. Read the usage examples that are displayed.  
- 5. Run any of the examples.  
-
 
-###### TROUBLESHOOTING:
- 1. Check you have the required imports installed (configparser and requests).  
-     I.E.: pip install configparser requests  
+Instructions
+------------
 
+ 1. Extract `WhatsApp-GD-Extractor-master.zip`.
+ 2. Install dependencies: Run `python3 -m pip install -r requirements.txt`
+    from your command console. Make sure gpsoauth is the latest version.
+ 3. Edit the `[auth]` section in `settings.cfg`.
+ 4. Run `python3 WhatsAppGDExtract.py` from your command console.
+ 5. Read the usage examples that are displayed.
+ 6. Run any of the examples.
 
-###### CREDITS:
- AUTHOR: TripCode  
+If downloading is interrupted, the files that were received successfully
+won't be re-downloaded when running the tool one more time. After
+downloading, you may verify the integrity of the downloaded files using
+`md5sum --check md5sum.txt` on Linux or [md5summer][MD5SUMMER] on Windows.
+
+
+Troubleshooting
+---------------
+
+ 1. Check that you have the required imports installed: `python3 -m pip
+    install gpsoauth`
+ 2. If you have `Error:Need Browser`, go to this url to solve the issue:
+    https://accounts.google.com/b/0/DisplayUnlockCaptcha
+
+
+Credits
+-------
+
+Author: TripCode
+
+Contributors: DrDeath1122 from XDA for the multi-threading backbone part,
+YuriCosta for reverse engineering the new restore system
+
+
+[MD5SUMMER]: http://md5summer.org/
+[PYTHON]: https://www.python.org/downloads/