liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

☦️ Rpc: fix backup commands responses (#1502)

Browse Source
This commit is contained in:
Anna Prosvetova 2022-07-31 01:14:16 +02:00 committed by GitHub
parent c40e8811d6
commit 4c39dcbe0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
applications/rpc/rpc_storage.c
View File

@ -594,23 +594,19 @@ static void rpc_system_storage_backup_create_process(const PB_Main* request, voi
FURI_LOG_D(TAG, "BackupCreate"); FURI_LOG_D(TAG, "BackupCreate");
RpcSession* session = (RpcSession*)context; RpcStorageSystem* rpc_storage = context;
RpcSession* session = rpc_storage->session;
furi_assert(session); furi_assert(session);
PB_Main* response = malloc(sizeof(PB_Main));
response->command_id = request->command_id;
response->has_next = false;
Storage* fs_api = furi_record_open(RECORD_STORAGE); Storage* fs_api = furi_record_open(RECORD_STORAGE);
bool backup_ok = bool backup_ok =
lfs_backup_create(fs_api, request->content.storage_backup_create_request.archive_path); lfs_backup_create(fs_api, request->content.storage_backup_create_request.archive_path);
response->command_status = backup_ok ? PB_CommandStatus_OK : PB_CommandStatus_ERROR;
furi_record_close(RECORD_STORAGE); furi_record_close(RECORD_STORAGE);
rpc_send_and_release(session, response); rpc_send_and_release_empty(
free(response); session, request->command_id, backup_ok ? PB_CommandStatus_OK : PB_CommandStatus_ERROR);
} }
static void rpc_system_storage_backup_restore_process(const PB_Main* request, void* context) { static void rpc_system_storage_backup_restore_process(const PB_Main* request, void* context) {
@ -619,24 +615,19 @@ static void rpc_system_storage_backup_restore_process(const PB_Main* request, vo
FURI_LOG_D(TAG, "BackupRestore"); FURI_LOG_D(TAG, "BackupRestore");
RpcSession* session = (RpcSession*)context; RpcStorageSystem* rpc_storage = context;
RpcSession* session = rpc_storage->session;
furi_assert(session); furi_assert(session);
PB_Main* response = malloc(sizeof(PB_Main));
response->command_id = request->command_id;
response->has_next = false;
response->command_status = PB_CommandStatus_OK;
Storage* fs_api = furi_record_open(RECORD_STORAGE); Storage* fs_api = furi_record_open(RECORD_STORAGE);
bool backup_ok = bool backup_ok =
lfs_backup_unpack(fs_api, request->content.storage_backup_restore_request.archive_path); lfs_backup_unpack(fs_api, request->content.storage_backup_restore_request.archive_path);
response->command_status = backup_ok ? PB_CommandStatus_OK : PB_CommandStatus_ERROR;
furi_record_close(RECORD_STORAGE); furi_record_close(RECORD_STORAGE);
rpc_send_and_release(session, response); rpc_send_and_release_empty(
free(response); session, request->command_id, backup_ok ? PB_CommandStatus_OK : PB_CommandStatus_ERROR);
} }
void* rpc_system_storage_alloc(RpcSession* session) { void* rpc_system_storage_alloc(RpcSession* session) {