From 72ef43fbf6eb053f47043aedee9b921e30082e92 Mon Sep 17 00:00:00 2001
From: LukeZGD <l32luke@gmail.com>
Date: Mon, 4 Jul 2022 10:45:05 +0800
Subject: [PATCH] Do not proceed if iPhone 4 is in kDFU mode

kDFU does NOT work for ch3rryflower/iPhone4Down, this change prevents users proceeding with kDFU.
This does not apply for 7.1.2 restores and restoring with SHSH blobs.
---
 resources/device.sh | 21 +++++++++++++++------
 restore.sh          | 14 +++++++++++++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/resources/device.sh b/resources/device.sh
index 7f351a5..a76b329 100755
--- a/resources/device.sh
+++ b/resources/device.sh
@@ -223,7 +223,7 @@ EnterPwnDFU() {
         SaveExternal https://github.com/LukeZGD/ipwndfu/archive/6e67c9e28a5f7f63f179dea670f7f858712350a0.zip ipwndfu 61333249eb58faebbb380c4709384034ce0e019a
     fi
     
-    Log "Entering pwnDFU mode with: $pwnDFUTool..."
+    Log "Entering pwnDFU mode with: $pwnDFUTool"
     if [[ $pwnDFUTool == "ipwndfu" ]]; then
         cd resources/ipwndfu
         $ipwndfu -p
@@ -240,12 +240,21 @@ EnterPwnDFU() {
         $pwnDFUTool -p
         pwnDFUDevice=$?
     fi
-    [[ $DeviceProc == 7 ]] && pwnD=$($irecovery -q | grep -c "PWND")
-    [[ $DeviceProc == 4 ]] && SendiBSS=1
+    if [[ $DeviceProc == 4 || $DeviceProc == 7 ]]; then
+        pwnD=$($irecovery -q | grep -c "PWND")
+        SendiBSS=1
+    fi
     
-    if [[ $pwnDFUDevice != 0 && $ProductType == "iPhone3,1" ]]; then
-        Error "Failed to enter pwnDFU mode. Please run the script again" \
-        "Exit DFU mode first by holding the TOP and HOME buttons for about 15 seconds."
+    if [[ $ProductType == "iPhone3,1" ]]; then
+        if [[ $pwnDFUDevice != 0 ]]; then
+            Error "Failed to enter pwnDFU mode. Please run the script again" \
+            "Exit DFU mode first by holding the TOP and HOME buttons for about 15 seconds."
+        elif [[ $pwnD != 1 ]]; then
+            Error "Your device is not in pwnDFU mode, cannot proceed. Note that kDFU mode will NOT work!" \
+            "Exit DFU mode by holding the TOP and HOME buttons for about 15 seconds."
+        else
+            Log "Device in pwnDFU mode detected."
+        fi
     elif [[ $pwnDFUDevice != 0 && $pwnD != 1 ]]; then
         echo -e "\n${Color_R}[Error] Failed to enter pwnDFU mode. Please run the script again ${Color_N}"
         echo "${Color_Y}* If the screen is black, exit DFU mode first by holding the TOP and HOME buttons for about 15 seconds. ${Color_N}"
diff --git a/restore.sh b/restore.sh
index e5c4f39..c8ef8fb 100755
--- a/restore.sh
+++ b/restore.sh
@@ -209,7 +209,19 @@ Main() {
         fi
 
     elif [[ $Mode == *"4" || $DeviceProc == 7 ]]; then
-        if [[ $DeviceState == "Normal" ]]; then
+        if [[ $DeviceState == "Normal" && $OSVer == "7.1.2" ]]; then
+            kDFU
+        elif [[ $DeviceState == "DFU" && $OSVer == "7.1.2" ]]; then
+            Input "Select the mode that your device is currently in:"
+            Selection=("kDFU mode" "DFU/pwnDFU mode")
+            select opt in "${Selection[@]}"; do
+            case $opt in
+                "kDFU mode" ) break;;
+                "DFU/pwnDFU mode" ) EnterPwnDFU; break;;
+                * ) exit 0;;
+            esac
+            done
+        elif [[ $DeviceState == "Normal" ]]; then
             Echo "* The device needs to be in recovery/DFU mode before proceeding."
             read -p "$(Input 'Send device to recovery mode? (y/N):')" Selection
             [[ $Selection == 'Y' || $Selection == 'y' ]] && Recovery || exit