commander: allow backup list & check when the device is locked

Author: benma

src/commander.c

@@ -395,11 +395,6 @@ static void commander_process_backup(yajl_val json_node)
     char source[MAX(MAX(strlens(attr_str(ATTR_U2F)), strlens(attr_str(ATTR_HWW))),
                                                          strlens(attr_str(ATTR_all))) + 1];
 
-    if (wallet_is_locked()) {
-        commander_fill_report(cmd_str(CMD_backup), NULL, DBB_ERR_IO_LOCKED);
-        return;
-    }
-
     if (strlens(value)) {
         if (STREQ(value, attr_str(ATTR_list))) {
             sd_list(CMD_backup);
@@ -410,17 +405,6 @@ static void commander_process_backup(yajl_val json_node)
         return;
     }
 
-    if (strlens(erase)) {
-        // Erase single file
-        int status = touch_button_press(TOUCH_LONG_WARN);
-        if (status == DBB_TOUCHED) {
-            sd_erase(CMD_backup, erase);
-        } else {
-            commander_fill_report(cmd_str(CMD_backup), NULL, status);
-        }
-        return;
-    }
-
     if (strlens(source_y)) {
         snprintf(source, sizeof(source), "%s", source_y);
     } else {
@@ -432,12 +416,6 @@ static void commander_process_backup(yajl_val json_node)
         }
     }
 
-    if (!strlens(key) && !STREQ(source, attr_str(ATTR_U2F))) {
-        // Exit if backing up HWW but no key given
-        commander_fill_report(cmd_str(CMD_seed), NULL, DBB_ERR_SD_KEY);
-        return;
-    }
-
     if (check) {
         // Verify existing backup
         if (STREQ(source, attr_str(ATTR_all))) {
@@ -448,6 +426,30 @@ static void commander_process_backup(yajl_val json_node)
         return;
     }
 
+
+    if (wallet_is_locked()) {
+        commander_fill_report(cmd_str(CMD_backup), NULL, DBB_ERR_IO_LOCKED);
+        return;
+    }
+
+    if (strlens(erase)) {
+        // Erase single file
+        int status = touch_button_press(TOUCH_LONG_WARN);
+        if (status == DBB_TOUCHED) {
+            sd_erase(CMD_backup, erase);
+        } else {
+            commander_fill_report(cmd_str(CMD_backup), NULL, status);
+        }
+        return;
+    }
+
+
+    if (!strlens(key) && !STREQ(source, attr_str(ATTR_U2F))) {
+        // Exit if backing up HWW but no key given
+        commander_fill_report(cmd_str(CMD_seed), NULL, DBB_ERR_SD_KEY);
+        return;
+    }
+
     if (filename) {
         // Create new backup
         commander_process_backup_create(key, filename, source);

tests/tests_api.c

@@ -2734,8 +2734,10 @@ static void tests_echo_tfa(void)
                         KEY_STANDARD);
     ASSERT_REPORT_HAS(flag_msg(DBB_ERR_IO_LOCKED));
 
-    api_format_send_cmd(cmd_str(CMD_backup), attr_str(ATTR_list), KEY_STANDARD);
-    ASSERT_REPORT_HAS(flag_msg(DBB_ERR_IO_LOCKED));
+    if (!TEST_LIVE_DEVICE) {
+        api_format_send_cmd(cmd_str(CMD_backup), attr_str(ATTR_list), KEY_STANDARD);
+        ASSERT_REPORT_HAS("test_backup.pdf");
+    }
 }