@@ -1078,6 +1078,9 @@ device_manufacturing() {
10781078 print " * Cannot check $device_name bootrom model in Recovery mode. Enter DFU mode to get bootrom model"
10791079 return
10801080 elif [[ $device_type != " iPhone2,1" && $device_type != " iPod2,1" ]]; then
1081+ case $device_type in
1082+ iPhone4,1 | iPhone5,2 | iPad3,[26] ) device_9900candidate=1;;
1083+ esac
10811084 if [[ $device_type == " DFU" ]]; then
10821085 print " * Cannot check for manufacturing date in DFU mode"
10831086 return
@@ -1110,7 +1113,7 @@ device_manufacturing() {
11101113 print " * Manufactured in $year_half "
11111114 elif [[ $device_mode == " Normal" ]] && (( device_proc >= 5 )) ; then
11121115 print " * Select Pair Device to get more device information"
1113- if [[ -n $device_use_bb ]] && (( device_proc <= 6 )) ; then
1116+ if [[ -n $device_use_bb && $device_9900candidate == 1 ]] ; then
11141117 print " * This will also check if your device is affected by the 9900 IMEI activation issue"
11151118 fi
11161119 fi
@@ -7708,14 +7711,23 @@ menu_print_info() {
77087711 fi
77097712 if [[ $device_proc != 1 ]] && (( device_proc < 7 )) ; then
77107713 case $device_proc in
7711- [56] ) [[ $device_imei == " 9900" * ]] && warn " Your device's IMEI starts with 9900. These devices are affected by an activation looping issue."
7714+ [56] )
7715+ if [[ $device_imei == " 9900" * ]]; then
7716+ warn " Your device's IMEI starts with 9900. These devices are affected by an activation issue."
7717+ elif [[ $device_9900candidate == 1 && $device_mode == " Normal" && -n $device_imei ]]; then
7718+ print " * Your device's IMEI does not start with 9900. Your device should be safe from the activation issue."
7719+ elif [[ $device_9900candidate == 1 && $device_mode != " Normal" ]]; then
7720+ warn " Your device is possibly affected by an activation issue. Please check your device's IMEI."
7721+ print " * If it starts with 9900, enable Activation Records stitching in Misc Utilities"
7722+ fi
7723+ ;;
77127724 esac
77137725 if [[ $device_auto_actrec == 1 ]]; then
7714- print " * Activated A${device_proc} (X) device with 9900 IMEI detected. Activation record stitching enabled."
7726+ print " * Activated A${device_proc} (X) device with 9900 IMEI detected. Activation Records stitching enabled."
77157727 elif [[ $device_auto_actrec == 2 ]]; then
7716- print " * Existing activation records detected. Activation record stitching enabled."
7728+ print " * Existing activation records detected. Activation Records stitching enabled."
77177729 elif [[ $device_actrec == 1 ]]; then
7718- warn " activation-records flag detected. Activation record stitching enabled."
7730+ warn " activation-records flag detected. Activation Records stitching enabled."
77197731 fi
77207732 if [[ $device_pwnrec == 1 ]]; then
77217733 warn " Pwned recovery flag detected. Assuming device is in pwned recovery mode."
0 commit comments