Skip to content

Ping command needed to test device state: do not subject to long touc… #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2018
Merged

Ping command needed to test device state: do not subject to long touc… #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/commander.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,13 +1792,6 @@ static int commander_check_init(const char *encrypted_command)
return DBB_ERROR;
}

if (memory_report_access_err_count() >= COMMANDER_TOUCH_ATTEMPTS) {
if (touch_button_press(DBB_TOUCH_LONG) != DBB_TOUCHED) {
commander_fill_report(cmd_str(CMD_input), NULL, DBB_ERR_IO_TOUCH_BUTTON);
return DBB_ERROR;
}
}

if (!encrypted_command) {
commander_access_err(DBB_ERR_IO_NO_INPUT, memory_access_err_count(DBB_ACCESS_ITERATE));
return DBB_ERROR;
Expand Down Expand Up @@ -1828,6 +1821,13 @@ static int commander_check_init(const char *encrypted_command)
yajl_tree_free(json_node);
}

if (memory_report_access_err_count() >= COMMANDER_TOUCH_ATTEMPTS) {
if (touch_button_press(DBB_TOUCH_LONG) != DBB_TOUCHED) {
commander_fill_report(cmd_str(CMD_input), NULL, DBB_ERR_IO_TOUCH_BUTTON);
return DBB_ERROR;
}
}

// Force setting a password before processing any other command.
if (!memory_report_erased()) {
return DBB_OK;
Expand Down