Add passcode detection for 'iPhone10,'

+ Also remove untested version option, uneeded
This commit is contained in:
Samara committed 2024-05-14 21:45:14 -07:00
1 parent 34edfd649b
commit 8ef0035dc0
2 files changed
+29 -21

No files matched your search

+11 -3
View File
@@ -136,11 +136,19 @@ void tui_screen_main_redraw(void) {
printf("Sorry, %s (iOS %s) is not supported.", tui_connected_devices->display_name, tui_connected_devices->version);
ecid_y = 6;
tui_can_start = false;
} else if (tui_compare_versions(tui_connected_devices->version, "15.0") < 0 || tui_compare_versions(tui_connected_devices->version, "17.3.1") > 0) {
} else if (tui_compare_versions(tui_connected_devices->version, "15.0") < 0) {
printf("Sorry, %s is supported, but iOS", tui_connected_devices->display_name);
MOVETOT(3, 6);
printf("%s is not.", tui_connected_devices->version);
PRINTATT(3, 7, "Supported versions are 15.0 - 17.3.1.");
PRINTATT(3, 7, "Supported versions are 15.0+");
ecid_y = 8;
tui_can_start = false;
} else if (tui_connected_devices->requires_passcode_disabled) {
printf("Sorry, this devices passcode must be disabled on %s.", tui_connected_devices->version);
MOVETOT(3, 6);
printf("On 16.0+, you must reset the phone to factory settings");
MOVETOT(3, 7);
printf("and not have a passcode enabled ever since last restore.");
ecid_y = 8;
tui_can_start = false;
} else {
@@ -163,7 +171,7 @@ void tui_screen_main_redraw(void) {
} else {
PRINTATT(3, 6, "Press (E) to show ECID.");
}
PRINTATT(3, 7, "NOTE: Ensure installed iOS is in range 15.0 - 17.3.1!");
PRINTATT(3, 7, "NOTE: Ensure installed iOS is in range 15.0+");
tui_can_start = true;
} else if (tui_connected_devices->mode == TUI_DEVICE_MODE_DFU) {
MOVETOT(3, 5);
+18 -18
View File
@@ -48,15 +48,15 @@ extern bool easter_egg;
void tui_screen_options_options(void) {
SETCOLOR(FG_WHITE, BG_BLACK);
// MOVETOT(3, 8);
// printf("[%c] %sAllow untested iOS/iPadOS versions" COLOR(FG_WHITE, BG_BLACK),
// tui_options_allow_untested ? 'x' : ' ',
// tui_options_nav_selection == 1 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
// (
// tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
// ) && (tui_mouse_y == tui_y_offset + 7) ? COLOR(FG_BLACK, BG_WHITE) : ""
// ));
MOVETOT(3, 8);
printf("[%c] %sAllow untested iOS/iPadOS versions" COLOR(FG_WHITE, BG_BLACK),
tui_options_allow_untested ? 'x' : ' ',
tui_options_nav_selection == 1 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
(
tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
) && (tui_mouse_y == tui_y_offset + 7) ? COLOR(FG_BLACK, BG_WHITE) : ""
));
MOVETOT(3, 9);
printf("[%c] %sSafe Mode " COLOR(FG_WHITE, BG_BLACK),
tui_options_safe_mode ? 'x' : ' ',
tui_options_nav_selection == 2 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
@@ -64,7 +64,7 @@ void tui_screen_options_options(void) {
tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
) && (tui_mouse_y == tui_y_offset + 8) ? COLOR(FG_BLACK, BG_WHITE) : ""
));
MOVETOT(3, 10);
MOVETOT(3, 9);
printf("[%c] %sVerbose Boot " COLOR(FG_WHITE, BG_BLACK),
tui_options_verbose_boot ? 'x' : ' ',
tui_options_nav_selection == 3 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
@@ -72,7 +72,7 @@ void tui_screen_options_options(void) {
tui_mouse_x >= tui_x_offset + 6 && tui_mouse_x <= tui_x_offset + 6 + 34
) && (tui_mouse_y == tui_y_offset + 9) ? COLOR(FG_BLACK, BG_WHITE) : ""
));
MOVETOT(3, 11);
MOVETOT(3, 10);
printf("[%c] %sForce Revert " COLOR(FG_WHITE, BG_BLACK),
tui_options_force_revert ? 'x' : ' ',
tui_options_nav_selection == 4 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
@@ -85,9 +85,9 @@ void tui_screen_options_options(void) {
} else {
SETCOLOR(FG_BLUE, BG_BLACK);
}
DRAWLINET(3, 13, 76);
DRAWLINET(3, 12, 76);
SETCOLOR(FG_WHITE, BG_BLACK);
MOVETOT(7, 15);
MOVETOT(7, 14);
printf("%sBoot Arguments: " COLOR(FG_WHITE, BG_BLACK),
tui_options_nav_selection == 5 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
(
@@ -99,7 +99,7 @@ void tui_screen_options_options(void) {
const char* boot_args_hint = tui_options_is_editing_boot_args ? "(press ENTER when done)" : " (press ENTER to edit)";
MOVETOT((int)(80 - 5 - strlen(boot_args_hint)), 15);
printf("%s", boot_args_hint);
MOVETOT(3, 17);
MOVETOT(3, 16);
printf("[%c] %s%s " COLOR(FG_WHITE, BG_BLACK),
tui_options_flower_chain ? 'x' : ' ',
tui_options_nav_selection == 6 ? COLOR(FG_BLACK, BG_BRIGHT_WHITE) : (
@@ -108,7 +108,7 @@ void tui_screen_options_options(void) {
) && (tui_mouse_y == tui_y_offset + 16) ? COLOR(FG_BLACK, BG_WHITE) : ""
), easter_egg ? "Neko Chain " : "Flower Chain");
MOVETOT(7, 16);
MOVETOT(7, 15);
if (supports_bright_colors) {
SETCOLOR(tui_options_is_editing_boot_args ? FG_YELLOW : FG_WHITE, BG_BRIGHT_BLACK);
} else {
@@ -131,7 +131,7 @@ void tui_screen_options_options(void) {
}
if (tui_options_is_editing_boot_args) {
MOVETOT((int)(7 + tui_options_boot_args_cursor - tui_options_boot_args_offset), 16);
MOVETOT((int)(7 + tui_options_boot_args_cursor - tui_options_boot_args_offset), 15);
if (supports_bright_colors) {
SETCOLOR(FG_BRIGHT_BLACK, BG_YELLOW);
} else {
@@ -141,9 +141,9 @@ void tui_screen_options_options(void) {
}
SETCOLOR(FG_WHITE, BG_BLACK);
MOVETOT(5, 16);
MOVETOT(5, 15);
printf(tui_options_boot_args_offset > 0 ? "<<" : " ");
MOVETOT(75, 16);
MOVETOT(75, 15);
printf((strlen(tui_options_boot_args) - tui_options_boot_args_offset) > 68 ? ">>" : " ");
}
@@ -156,7 +156,7 @@ void tui_screen_options_redraw(void) {
} else {
SETCOLOR(FG_BLUE, BG_BLACK);
}
DRAWLINET(3, 6, 76);
DRAWLINET(3, 6, 75);
tui_screen_options_nav();
tui_screen_options_options();
fflush(stdout);