Deny BT-RPC commands when locked (Toggle)

applications/main/xtreme_app/scenes/xtreme_app_scene_interface_lockscreen.c

@@ -32,11 +32,11 @@ static void xtreme_app_scene_interface_lockscreen_bad_pins_format_changed(Variab
     app->save_settings = true;
 }
 
-static void xtreme_app_scene_interface_lockscreen_pin_unlock_from_app_changed(VariableItem* item) {
+static void xtreme_app_scene_interface_lockscreen_allow_locked_rpc_commands_changed(VariableItem* item) {
     XtremeApp* app = variable_item_get_context(item);
     bool value = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, value ? "ON" : "OFF");
-    XTREME_SETTINGS()->pin_unlock_from_app = value;
+    XTREME_SETTINGS()->allow_locked_rpc_commands = value;
     app->save_settings = true;
 }
 
@@ -107,13 +107,13 @@ void xtreme_app_scene_interface_lockscreen_on_enter(void* context) {
 
     item = variable_item_list_add(
         var_item_list,
-        "PIN Unlock From App",
+        "Allow RPC while locked",
         2,
-        xtreme_app_scene_interface_lockscreen_pin_unlock_from_app_changed,
+        xtreme_app_scene_interface_lockscreen_allow_locked_rpc_commands_changed,
         app);
-    variable_item_set_current_value_index(item, xtreme_settings->pin_unlock_from_app);
+    variable_item_set_current_value_index(item, xtreme_settings->allow_locked_rpc_commands);
     variable_item_set_current_value_text(
-        item, xtreme_settings->pin_unlock_from_app ? "ON" : "OFF");
+        item, xtreme_settings->allow_locked_rpc_commands ? "ON" : "OFF");
 
     item = variable_item_list_add(
         var_item_list,

applications/services/bt/bt_service/bt.c

@@ -216,19 +216,9 @@ static void bt_rpc_send_bytes_callback(void* context, uint8_t* bytes, size_t byt
     }
 }
 
-// Called from GAP thread
-static bool bt_on_gap_event_callback(GapEvent event, void* context) {
-    furi_assert(context);
-    Bt* bt = context;
-    bool ret = false;
-    bt->pin = 0;
-
-    if(event.type == GapEventTypeConnected) {
-        // Update status bar
-        bt->status = BtStatusConnected;
-        BtMessage message = {.type = BtMessageTypeUpdateStatus};
-        furi_check(
-            furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
+// Open BT Connection
+void bt_open_rpc_connection(Bt* bt) {
+    if(!bt->rpc_session) {
         // Clear BT_RPC_EVENT_DISCONNECTED because it might be set from previous session
         furi_event_flag_clear(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
         if(bt->profile == BtProfileSerial) {
@@ -247,6 +237,34 @@ static bool bt_on_gap_event_callback(GapEvent event, void* context) {
                 FURI_LOG_W(TAG, "RPC is busy, failed to open new session");
             }
         }
+    }
+}
+
+void bt_close_rpc_connection(Bt* bt) {
+    if(bt->profile == BtProfileSerial && bt->rpc_session) {
+        FURI_LOG_I(TAG, "Close RPC connection");
+        furi_event_flag_set(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
+        rpc_session_close(bt->rpc_session);
+        furi_hal_bt_serial_set_event_callback(0, NULL, NULL);
+        bt->rpc_session = NULL;
+    }
+}
+
+
+// Called from GAP thread
+static bool bt_on_gap_event_callback(GapEvent event, void* context) {
+    furi_assert(context);
+    Bt* bt = context;
+    bool ret = false;
+    bt->pin = 0;
+
+    if(event.type == GapEventTypeConnected) {
+        // Update status bar
+        bt->status = BtStatusConnected;
+        BtMessage message = {.type = BtMessageTypeUpdateStatus};
+        furi_check(
+            furi_message_queue_put(bt->message_queue, &message, FuriWaitForever) == FuriStatusOk);
+        bt_open_rpc_connection(bt);
         // Update battery level
         PowerInfo info;
         power_get_info(bt->power, &info);
@@ -323,16 +341,6 @@ static void bt_show_warning(Bt* bt, const char* text) {
     dialog_message_show(bt->dialogs, bt->dialog_message);
 }
 
-static void bt_close_rpc_connection(Bt* bt) {
-    if(bt->profile == BtProfileSerial && bt->rpc_session) {
-        FURI_LOG_I(TAG, "Close RPC connection");
-        furi_event_flag_set(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
-        rpc_session_close(bt->rpc_session);
-        furi_hal_bt_serial_set_event_callback(0, NULL, NULL);
-        bt->rpc_session = NULL;
-    }
-}
-
 static void bt_change_profile(Bt* bt, BtMessage* message) {
     if(furi_hal_bt_is_ble_gatt_gap_supported()) {
         bt_settings_load(&bt->bt_settings);

applications/services/bt/bt_service/bt.h

@@ -99,6 +99,19 @@ void bt_disable_peer_key_update(Bt* bt);
 */
 void bt_enable_peer_key_update(Bt* bt);
 
+/**
+ * 
+ * (Probably bad) way of opening the RPC connection, everywhereTM
+*/
+
+void bt_open_rpc_connection(Bt* bt);
+
+/**
+ * 
+ * Closing the RPC connection, everywhereTM
+*/
+void bt_close_rpc_connection(Bt* bt);
+
 #ifdef __cplusplus
 }
 #endif

applications/services/desktop/desktop.c

@@ -242,6 +242,11 @@ void desktop_lock(Desktop* desktop, bool pin_lock) {
         Cli* cli = furi_record_open(RECORD_CLI);
         cli_session_close(cli);
         furi_record_close(RECORD_CLI);
+        if (!XTREME_SETTINGS()->allow_locked_rpc_commands) {
+            Bt* bt = furi_record_open(RECORD_BT);
+            bt_close_rpc_connection(bt);
+            furi_record_close(RECORD_BT);
+        }
     }
 
     desktop_auto_lock_inhibit(desktop);
@@ -270,6 +275,10 @@ void desktop_unlock(Desktop* desktop) {
         furi_record_close(RECORD_CLI);
     }
 
+    Bt* bt = furi_record_open(RECORD_BT);
+    bt_open_rpc_connection(bt);
+    furi_record_close(RECORD_BT);
+
     DesktopStatus status = {.locked = false};
     furi_pubsub_publish(desktop->status_pubsub, &status);
 }
@@ -435,9 +444,7 @@ bool desktop_api_is_locked(Desktop* instance) {
 
 void desktop_api_unlock(Desktop* instance) {
     furi_assert(instance);
-    if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock) || XTREME_SETTINGS()->pin_unlock_from_app) {
-        view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopLockedEventUnlocked);
-    }
+    view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopLockedEventUnlocked);
 }
 
 FuriPubSub* desktop_api_get_status_pubsub(Desktop* instance) {

applications/services/rpc/rpc.c

@@ -9,11 +9,13 @@
 #include <portmacro.h>
 
 #include <furi.h>
+#include <furi_hal.h>
 
 #include <cli/cli.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <m-dict.h>
+#include <xtreme.h>
 
 #define TAG "RpcSrv"
 
@@ -363,41 +365,46 @@ static void rpc_session_thread_state_callback(FuriThreadState thread_state, void
 }
 
 RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
-    furi_assert(rpc);
+    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);
+        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->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);
+        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 {
+        return NULL;
     }
-
-    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) {

firmware/targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,34.3,,
+Version,+,34.4,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/main/archive/helpers/favorite_timeout.h,,
 Header,+,applications/services/applications.h,,
@@ -626,6 +626,8 @@ Function,+,bt_get_profile_pairing_method,GapPairing,Bt*
 Function,+,bt_keys_storage_set_default_path,void,Bt*
 Function,+,bt_keys_storage_set_storage_path,void,"Bt*, const char*"
 Function,+,bt_remote_rssi,_Bool,"Bt*, uint8_t*"
+Function,+,bt_open_rpc_connection,void,Bt*
+Function,+,bt_close_rpc_connection,void,Bt*
 Function,+,bt_set_profile,_Bool,"Bt*, BtProfile"
 Function,+,bt_set_profile_adv_name,void,"Bt*, const char*, ..."
 Function,+,bt_set_profile_mac_address,void,"Bt*, const uint8_t[6]"

lib/xtreme/settings.c

@@ -13,7 +13,7 @@ XtremeSettings xtreme_settings = {
     .wii_menu = true, // ON
     .lock_on_boot = false, // OFF
     .bad_pins_format = false, // OFF
-    .pin_unlock_from_app = false, // OFF
+    .allow_locked_rpc_commands = false, // OFF
     .lockscreen_time = true, // ON
     .lockscreen_seconds = false, // OFF
     .lockscreen_date = true, // ON
@@ -76,8 +76,8 @@ void XTREME_SETTINGS_LOAD() {
             x->bad_pins_format = b;
         }
         flipper_format_rewind(file);
-        if(flipper_format_read_bool(file, "pin_unlock_from_app", &b, 1)) {
-            x->pin_unlock_from_app = b;
+        if(flipper_format_read_bool(file, "allow_locked_rpc_commands", &b, 1)) {
+            x->allow_locked_rpc_commands = b;
         }
         flipper_format_rewind(file);
         if(flipper_format_read_bool(file, "lock_on_boot", &b, 1)) {
@@ -182,7 +182,7 @@ void XTREME_SETTINGS_SAVE() {
         flipper_format_write_bool(file, "fallback_anim", &x->fallback_anim, 1);
         flipper_format_write_bool(file, "wii_menu", &x->wii_menu, 1);
         flipper_format_write_bool(file, "bad_pins_format", &x->bad_pins_format, 1);
-        flipper_format_write_bool(file, "pin_unlock_from_app", &x->pin_unlock_from_app, 1);
+        flipper_format_write_bool(file, "allow_locked_rpc_commands", &x->allow_locked_rpc_commands, 1);
         flipper_format_write_bool(file, "lock_on_boot", &x->lock_on_boot, 1);
         flipper_format_write_bool(file, "lockscreen_time", &x->lockscreen_time, 1);
         flipper_format_write_bool(file, "lockscreen_seconds", &x->lockscreen_seconds, 1);

lib/xtreme/xtreme.h

@@ -35,7 +35,7 @@ typedef struct {
     bool wii_menu;
     bool lock_on_boot;
     bool bad_pins_format;
-    bool pin_unlock_from_app;
+    bool allow_locked_rpc_commands;
     bool lockscreen_time;
     bool lockscreen_seconds;
     bool lockscreen_date;