commit 4e1e866772825280fb62c5583bf00c4b8a16ee76
author Alessandro Astone <ales.astone@gmail.com> Tue Mar 17 22:26:22 2020 +0100
committer Alessandro Astone <ales.astone@gmail.com> Tue Mar 17 23:08:15 2020 +0100
tree 3df16d17fd3002339c5cc80599b3c50b971f0e07
parent 72832597d310efb479135bf865ee1a9da502b640

recovery: clean up ask_to_continue_unverified

Change-Id: Ia7e0f5f150a7799efefd64e08a8f5dee35352317

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 972ae2f..8d85ef6 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -177,7 +177,7 @@
   return (chosen_item == 1);
 }
 
-static bool ask_to_continue_unverified_fn(Device* device) {
+bool ask_to_continue_unverified(Device* device) {
   if (get_build_type() == "user") {
     return false;
   } else {
@@ -583,11 +583,10 @@
           ui->ShowText(false);
           status = ApplyFromAdb(device, true /* rescue_mode */, &reboot_action);
         } else if (chosen_action == Device::APPLY_ADB_SIDELOAD) {
-          status = ApplyFromAdb(device, false /* rescue_mode */, &reboot_action,
-                                ask_to_continue_unverified_fn);
+          status = ApplyFromAdb(device, false /* rescue_mode */, &reboot_action);
         } else {
           adb = false;
-          status = ApplyFromSdcard(device, ui, ask_to_continue_unverified_fn);
+          status = ApplyFromSdcard(device, ui);
         }
 
         ui->Print("\nInstall from %s completed with status %d.\n", adb ? "ADB" : "SD card", status);
@@ -976,8 +975,7 @@
     if (!sideload_auto_reboot) {
       ui->ShowText(true);
     }
-    status = ApplyFromAdb(device, false /* rescue_mode */, &next_action,
-                          !sideload_auto_reboot ? ask_to_continue_unverified_fn : nullptr);
+    status = ApplyFromAdb(device, false /* rescue_mode */, &next_action);
     ui->Print("\nInstall from ADB complete (status: %d).\n", status);
     if (sideload_auto_reboot) {
       status = INSTALL_REBOOT;