Add files via upload

Author: EliteAndroidApps

WhatsAppKeyDBExtract.bat

@@ -1,7 +1,7 @@
 @echo off
 SETLOCAL ENABLEDELAYEDEXPANSION
 color 0a
-title WhatsApp Key/DB Extractor 4.6 (Official)
+title WhatsApp Key/DB Extractor 4.7 (Official)
 echo.
 echo =========================================================================
 echo = This script will extract the WhatsApp Key file and DB on Android 4.0+ =
@@ -12,7 +12,7 @@ echo = permissions. You will NOT lose ANY data and your current version will =
 echo = be restored at the end of the extraction process so try not to panic. =
 echo = Script by: TripCode (Greets to all who visit: XDA Developers Forums). =
 echo = Thanks to: dragomerlin for ABE and to Abinash Bishoyi for being cool. =
-echo =         ###          Version: v4.6 (11/10/2016)          ###          =
+echo =         ###          Version: v4.7 (12/10/2016)          ###          =
 echo =========================================================================
 echo.
 if not exist bin (
@@ -48,11 +48,11 @@ exit
 bin\adb.exe shell pm path com.whatsapp | bin\grep.exe package > tmp\wapath.txt
 bin\adb.exe shell "echo $EXTERNAL_STORAGE" > tmp\sdpath.txt
 bin\adb.exe shell dumpsys package com.whatsapp | bin\grep.exe versionName > tmp\wapver.txt
-bin\curl.exe -sI http://31.7.186.215/WhatsApp-2.11.431.apk | bin\grep.exe Content-Length > tmp\waplen.txt
+bin\curl.exe -sI http://www.cdn.whatsapp.net/android/2.11.431/WhatsApp.apk | bin\grep.exe Content-Length > tmp\waplen.txt
 set /p apkflen=<tmp\waplen.txt
 set apkflen=%apkflen:Content-Length: =%
 if %apkflen% == 18329558 (
-set apkfurl=http://31.7.186.215/WhatsApp-2.11.431.apk
+set apkfurl=http://www.cdn.whatsapp.net/android/2.11.431/WhatsApp.apk
 ) else (
 set apkfurl=http://whatcrypt.com/WhatsApp-2.11.431.apk
 )
@@ -191,6 +191,10 @@ echo.
 ) else (
 echo Operation failed
 )
+if not exist tmp\%apkname% (
+echo Downloading WhatsApp %versionName% to local folder
+bin\curl.exe -o tmp\%apkname% http://www.cdn.whatsapp.net/android/%versionName%/WhatsApp.apk
+)
 if exist tmp\%apkname% (
 echo Restoring WhatsApp %versionName%
 if %sdkver% geq 17 (

WhatsAppKeyDBExtract.ps1

@@ -1,4 +1,4 @@
-$Host.UI.RawUI.WindowTitle = "WhatsApp Key/DB Extractor 4.6 (Official)"
+$Host.UI.RawUI.WindowTitle = "WhatsApp Key/DB Extractor 4.7 (Official)"
 Function TerminateWithReason([String] $reason)
 {
 "`r`n$reason`r`n`r`nExiting...`r`n"
@@ -15,7 +15,7 @@ exit
 "= be restored at the end of the extraction process so try not to panic. ="
 "= Script by: TripCode (Greets to all who visit: XDA Developers Forums). ="
 "= Thanks to: dragomerlin for ABE and to Abinash Bishoyi for being cool. ="
-"=         ###          Version: v4.6 (11/10/2016)          ###          ="
+"=         ###          Version: v4.7 (12/10/2016)          ###          ="
 "=========================================================================`r`n"
 If (!(Test-Path "bin"))
 {
@@ -44,7 +44,7 @@ $version = $version.Trim() -replace 'versionName='
 } Else {
 TerminateWithReason("WhatsApp is not installed on the target device")
 }
-$apkflen = Invoke-Expression "bin\curl.exe -sI http://31.7.186.215/WhatsApp-2.11.431.apk | bin\grep.exe Content-Length 2>&1"
+$apkflen = Invoke-Expression "bin\curl.exe -sI http://www.cdn.whatsapp.net/android/2.11.431/WhatsApp.apk | bin\grep.exe Content-Length 2>&1"
 If ($apklen)
 {
 $apkflen = $apkflen.Trim() -replace 'Content-Length: '
@@ -53,7 +53,7 @@ $apkflen = 0;
 }
 If ($apkflen -eq 18329558)
 {
-$apkfurl = "http://31.7.186.215/WhatsApp-2.11.431.apk"
+$apkfurl = "http://www.cdn.whatsapp.net/android/2.11.431/WhatsApp.apk"
 } Else {
 $apkfurl = "http://whatcrypt.com/WhatsApp-2.11.431.apk"
 }
@@ -160,8 +160,11 @@ If (Test-Path "tmp\apps")
 Remove-Item tmp\apps -recurse
 }
 "Done`r`n"
-If (Test-Path "tmp\$apkname")
+if (-Not (Test-Path  "tmp\$apkname"))
 {
+"Downloading WhatsApp $version to local folder`r`n"
+Invoke-Expression "bin\curl.exe -o tmp\$apkname http://www.cdn.whatsapp.net/android/$version/WhatsApp.apk"
+}
 "Restoring WhatsApp $version"
 If ($sdkver -ge 17)
 {
@@ -170,7 +173,6 @@ Invoke-Expression "bin\adb.exe install -r -d tmp\$apkname"
 Invoke-Expression "bin\adb.exe install -r tmp\$apkname"
 }
 "Restore complete`r`n"
-}
 "Removing WhatsApp $version temporary apk`r`n"
 Remove-Item tmp\$apkname
 "`r`nOperation complete`r`n"

WhatsAppKeyDBExtract.sh

@@ -25,7 +25,7 @@ echo -e "
 = be restored at the end of the extraction process so try not to panic. =
 = Script by: TripCode (Greets to all who visit: XDA Developers Forums). =
 = Thanks to: dragomerlin for ABE and to Abinash Bishoyi for being cool. =
-=         ###          Version: v4.6 (11/10/2016)          ###          =
+=         ###          Version: v4.7 (12/10/2016)          ###          =
 =========================================================================
 "
 if (($is_adb == 0)); then
@@ -53,9 +53,9 @@ adb kill-server
 else
 apkpath=$(adb shell pm path com.whatsapp | grep package | tr -d '[[:space:]]')
 version=$(adb shell dumpsys package com.whatsapp | grep versionName | tr -d '[[:space:]]')
-apkflen=$(curl -sI http://31.7.186.215/WhatsApp-2.11.431.apk | grep Content-Length | grep -o '[0-9]*')
+apkflen=$(curl -sI http://www.cdn.whatsapp.net/android/2.11.431/WhatsApp.apk | grep Content-Length | grep -o '[0-9]*')
 if [ $apkflen -eq 18329558 ]; then
-apkfurl=http://31.7.186.215/WhatsApp-2.11.431.apk
+apkfurl=http://www.cdn.whatsapp.net/android/2.11.431/WhatsApp.apk
 else
 apkfurl=http://whatcrypt.com/WhatsApp-2.11.431.apk
 fi
@@ -120,6 +120,10 @@ adb push tmp/apps/com.whatsapp/f/key $sdpath
 else
 echo -e "Operation failed"
 fi
+if [ ! -f tmp/$apkname ]; then
+echo -e "\nDownloading WhatsApp ${version/versionName=/} to local folder\n"
+curl -o tmp/$apkname http://www.cdn.whatsapp.net/android/${version/versionName=/}/WhatsApp.apk
+fi
 echo -e "\nRestoring WhatsApp ${version/versionName=/}"
 if [ $sdkver -ge 17 ]; then
 adb install -r -d tmp/$apkname