recovery: handle back button when navigating recovery logs

Scott Mertz · Steve Kondik · commit d35a865b468f · 2016-09-03T22:26:17.000-07:00
Fixes the crash when a user presses a hardware back button
instead of the on screen menu item.

OPO-521
Change-Id: I579d2720cdf7256a269358d037582121425d7c25
diff --git a/recovery.cpp b/recovery.cpp
@@ -1058,7 +1058,8 @@ static void choose_recovery_file(Device* device) {
 
     while (true) {
         int chosen_item = get_menu_selection(headers, entries, 1, 0, device);
-        if (strcmp(entries[chosen_item], "Back") == 0) break;
+        if (chosen_item == Device::kGoBack) break;
+        if (chosen_item >= 0 && strcmp(entries[chosen_item], "Back") == 0) break;
 
         ui->ShowFile(entries[chosen_item]);
     }

Original file line number	Diff line number	Diff line change
`@@ -1058,7 +1058,8 @@ static void choose_recovery_file(Device* device) {`
`1058`	`1058`
`1059`	`1059`	`while (true) {`
`1060`	`1060`	`int chosen_item = get_menu_selection(headers, entries, 1, 0, device);`
`1061`		`- if (strcmp(entries[chosen_item], "Back") == 0) break;`
	`1061`	`+ if (chosen_item == Device::kGoBack) break;`
	`1062`	`+ if (chosen_item >= 0 && strcmp(entries[chosen_item], "Back") == 0) break;`
`1062`	`1063`
`1063`	`1064`	`ui->ShowFile(entries[chosen_item]);`
`1064`	`1065`	`}`