From 4b333b376799e64e47979944382cb3aa051ed671 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 29 Aug 2023 02:00:56 +0200
Subject: [PATCH] Simplify if to guard statement

---
 applications/services/rpc/rpc.c | 76 ++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c
index b67e05125..f07ba3352 100644
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -365,47 +365,45 @@ static void rpc_session_thread_state_callback(FuriThreadState thread_state, void
 }
 
 RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
-    if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock) ||
-       XTREME_SETTINGS()->allow_locked_rpc_commands) {
-        furi_assert(rpc);
-
-        RpcSession* session = malloc(sizeof(RpcSession));
-        session->callbacks_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
-        session->stream = furi_stream_buffer_alloc(RPC_BUFFER_SIZE, 1);
-        session->rpc = rpc;
-        session->terminate = false;
-        session->decode_error = false;
-        session->owner = owner;
-        RpcHandlerDict_init(session->handlers);
-
-        session->decoded_message = malloc(sizeof(PB_Main));
-        session->decoded_message->cb_content.funcs.decode = rpc_pb_content_callback;
-        session->decoded_message->cb_content.arg = session;
-
-        session->system_contexts = malloc(COUNT_OF(rpc_systems) * sizeof(void*));
-        for(size_t i = 0; i < COUNT_OF(rpc_systems); ++i) {
-            session->system_contexts[i] = rpc_systems[i].alloc(session);
-        }
-
-        RpcHandler rpc_handler = {
-            .message_handler = rpc_close_session_process,
-            .decode_submessage = NULL,
-            .context = session,
-        };
-        rpc_add_handler(session, PB_Main_stop_session_tag, &rpc_handler);
-
-        session->thread =
-            furi_thread_alloc_ex("RpcSessionWorker", 3072, rpc_session_worker, session);
-
-        furi_thread_set_state_context(session->thread, session);
-        furi_thread_set_state_callback(session->thread, rpc_session_thread_state_callback);
-
-        furi_thread_start(session->thread);
-
-        return session;
-    } else {
+    if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock) &&
+       !XTREME_SETTINGS()->allow_locked_rpc_commands)
         return NULL;
+
+    furi_assert(rpc);
+
+    RpcSession* session = malloc(sizeof(RpcSession));
+    session->callbacks_mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    session->stream = furi_stream_buffer_alloc(RPC_BUFFER_SIZE, 1);
+    session->rpc = rpc;
+    session->terminate = false;
+    session->decode_error = false;
+    session->owner = owner;
+    RpcHandlerDict_init(session->handlers);
+
+    session->decoded_message = malloc(sizeof(PB_Main));
+    session->decoded_message->cb_content.funcs.decode = rpc_pb_content_callback;
+    session->decoded_message->cb_content.arg = session;
+
+    session->system_contexts = malloc(COUNT_OF(rpc_systems) * sizeof(void*));
+    for(size_t i = 0; i < COUNT_OF(rpc_systems); ++i) {
+        session->system_contexts[i] = rpc_systems[i].alloc(session);
     }
+
+    RpcHandler rpc_handler = {
+        .message_handler = rpc_close_session_process,
+        .decode_submessage = NULL,
+        .context = session,
+    };
+    rpc_add_handler(session, PB_Main_stop_session_tag, &rpc_handler);
+
+    session->thread = furi_thread_alloc_ex("RpcSessionWorker", 3072, rpc_session_worker, session);
+
+    furi_thread_set_state_context(session->thread, session);
+    furi_thread_set_state_callback(session->thread, rpc_session_thread_state_callback);
+
+    furi_thread_start(session->thread);
+
+    return session;
 }
 
 void rpc_session_close(RpcSession* session) {