workflow/backup: fix merge conflict
@@ -44,12 +44,12 @@ static bool _backup(const CreateBackupRequest* request)
// replacing the sd card, not safely disposing of the old one.
// The issue fixes itself after replugging and going through the backup process again.
}
- workflow_status_create("Backup created");
+ workflow_status_create("Backup created", true);
return true;
case BACKUP_ERR_SD_WRITE:
case BACKUP_ERR_SD_LIST:
if (!workflow_get_interface_functions()->sd_card_inserted()) {
- workflow_status_create("Backup not created\nIs the SD card\ninserted?");
+ workflow_status_create("Backup not created\nIs the SD card\ninserted?", false);
} else {
char msg[100];
snprintf(
@@ -57,7 +57,7 @@ static bool _backup(const CreateBackupRequest* request)
sizeof(msg),
"Backup not created\nPlease contact\nsupport (%s)",
backup_error_str(res));
- workflow_status_create(msg);
+ workflow_status_create(msg, false);
}
return false;
default: {
@@ -67,7 +67,7 @@ static bool _backup(const CreateBackupRequest* request)
sizeof(msg),
"Backup not created\nPlease contact\nsupport (%s)",
backup_error_str(res));
- workflow_status_create(msg);
+ workflow_status_create(msg, false);
return false;
}
}
@@ -128,23 +128,23 @@ bool workflow_backup_check(char* id_out, bool silent)
case BACKUP_ERR_SD_LIST:
case BACKUP_ERR_SD_READ:
case BACKUP_ERR_SD_WRITE:
- workflow_status_create("Could not read\nor write to the\nmicro SD card");
+ workflow_status_create("Could not read\nor write to the\nmicro SD card", false);
return false;
case BACKUP_ERR_CHECK:
if (!silent) {
- workflow_status_create("Backup missing\nor invalid");
+ workflow_status_create("Backup missing\nor invalid", false);
}
return false;
case BACKUP_OK:
if (!silent) {
- workflow_status_create("Backup valid\nConfirm details");
+ workflow_status_create("Backup valid\nConfirm details", true);
workflow_confirm_scrollable(backup_name, id_out, true);
}
return true;
default: {
char err_msg[100];
snprintf(err_msg, 100, "Could not check\nbackup (%s)", backup_error_str(res));
- workflow_status_create(err_msg);
+ workflow_status_create(err_msg, false);
return false;
}
}
