From 2c7eb53caceea63999aed09d691271a3d1ee58bc Mon Sep 17 00:00:00 2001
From: Astra <93453568+Astrrra@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:30:26 +0300
Subject: [PATCH] [FL-2505] Active RPC session icon (#2583)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Active RPC session icon
* Add RpcOwner, don't show the RPC icon when the session was started from BLE
* Fix rpc_test and f18 api
* Bump API version

Co-authored-by: あく <alleteam@gmail.com>
---
 applications/debug/unit_tests/rpc/rpc_test.c |   4 +--
 applications/services/bt/bt_service/bt.c     |   2 +-
 applications/services/rpc/rpc.c              |   9 ++++++-
 applications/services/rpc/rpc.h              |  18 ++++++++++++-
 applications/services/rpc/rpc_cli.c          |   2 +-
 applications/services/rpc/rpc_gui.c          |  26 ++++++++++++++++++-
 assets/icons/StatusBar/Rpc_active_7x8.png    | Bin 0 -> 3607 bytes
 firmware/targets/f18/api_symbols.csv         |   5 ++--
 firmware/targets/f7/api_symbols.csv          |   5 ++--
 9 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 assets/icons/StatusBar/Rpc_active_7x8.png

diff --git a/applications/debug/unit_tests/rpc/rpc_test.c b/applications/debug/unit_tests/rpc/rpc_test.c
index 329f3b74..167266a8 100644
--- a/applications/debug/unit_tests/rpc/rpc_test.c
+++ b/applications/debug/unit_tests/rpc/rpc_test.c
@@ -84,7 +84,7 @@ static void test_rpc_setup(void) {
 
     rpc = furi_record_open(RECORD_RPC);
     for(int i = 0; !(rpc_session[0].session) && (i < 10000); ++i) {
-        rpc_session[0].session = rpc_session_open(rpc);
+        rpc_session[0].session = rpc_session_open(rpc, RpcOwnerUnknown);
         furi_delay_tick(1);
     }
     furi_check(rpc_session[0].session);
@@ -104,7 +104,7 @@ static void test_rpc_setup_second_session(void) {
     furi_check(!(rpc_session[1].session));
 
     for(int i = 0; !(rpc_session[1].session) && (i < 10000); ++i) {
-        rpc_session[1].session = rpc_session_open(rpc);
+        rpc_session[1].session = rpc_session_open(rpc, RpcOwnerUnknown);
         furi_delay_tick(1);
     }
     furi_check(rpc_session[1].session);
diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c
index 16b60231..2dcea348 100644
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -225,7 +225,7 @@ static bool bt_on_gap_event_callback(GapEvent event, void* context) {
         furi_event_flag_clear(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
         if(bt->profile == BtProfileSerial) {
             // Open RPC session
-            bt->rpc_session = rpc_session_open(bt->rpc);
+            bt->rpc_session = rpc_session_open(bt->rpc, RpcOwnerBle);
             if(bt->rpc_session) {
                 FURI_LOG_I(TAG, "Open RPC connection");
                 rpc_session_set_send_bytes_callback(bt->rpc_session, bt_rpc_send_bytes_callback);
diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c
index 57a4ec9a..5b09e9b5 100644
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -76,6 +76,7 @@ struct RpcSession {
     RpcBufferIsEmptyCallback buffer_is_empty_callback;
     RpcSessionClosedCallback closed_callback;
     RpcSessionTerminatedCallback terminated_callback;
+    RpcOwner owner;
     void* context;
 };
 
@@ -83,6 +84,11 @@ struct Rpc {
     FuriMutex* busy_mutex;
 };
 
+RpcOwner rpc_session_get_owner(RpcSession* session) {
+    furi_assert(session);
+    return session->owner;
+}
+
 static void rpc_close_session_process(const PB_Main* request, void* context) {
     furi_assert(request);
     furi_assert(context);
@@ -348,7 +354,7 @@ static void rpc_session_free_callback(FuriThreadState thread_state, void* contex
     }
 }
 
-RpcSession* rpc_session_open(Rpc* rpc) {
+RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner) {
     furi_assert(rpc);
 
     RpcSession* session = malloc(sizeof(RpcSession));
@@ -357,6 +363,7 @@ RpcSession* rpc_session_open(Rpc* rpc) {
     session->rpc = rpc;
     session->terminate = false;
     session->decode_error = false;
+    session->owner = owner;
     RpcHandlerDict_init(session->handlers);
 
     session->decoded_message = malloc(sizeof(PB_Main));
diff --git a/applications/services/rpc/rpc.h b/applications/services/rpc/rpc.h
index ec290e08..d11fdc16 100644
--- a/applications/services/rpc/rpc.h
+++ b/applications/services/rpc/rpc.h
@@ -30,6 +30,21 @@ typedef void (*RpcSessionClosedCallback)(void* context);
  * and all operations were finished */
 typedef void (*RpcSessionTerminatedCallback)(void* context);
 
+/** RPC owner */
+typedef enum {
+    RpcOwnerUnknown = 0,
+    RpcOwnerBle,
+    RpcOwnerUsb,
+    RpcOwnerCount,
+} RpcOwner;
+
+/** Get RPC session owner
+ *
+ * @param   session     pointer to RpcSession descriptor
+ * @return              session owner
+ */
+RpcOwner rpc_session_get_owner(RpcSession* session);
+
 /** Open RPC session
  *
  * USAGE:
@@ -44,10 +59,11 @@ typedef void (*RpcSessionTerminatedCallback)(void* context);
  *
  *
  * @param   rpc     instance
+ * @param   owner   owner of session
  * @return          pointer to RpcSession descriptor, or
  *                  NULL if RPC is busy and can't open session now
  */
-RpcSession* rpc_session_open(Rpc* rpc);
+RpcSession* rpc_session_open(Rpc* rpc, RpcOwner owner);
 
 /** Close RPC session
  * It is guaranteed that no callbacks will be called
diff --git a/applications/services/rpc/rpc_cli.c b/applications/services/rpc/rpc_cli.c
index d14b8eee..f1c139b5 100644
--- a/applications/services/rpc/rpc_cli.c
+++ b/applications/services/rpc/rpc_cli.c
@@ -47,7 +47,7 @@ void rpc_cli_command_start_session(Cli* cli, FuriString* args, void* context) {
     FURI_LOG_D(TAG, "Free memory %lu", mem_before);
 
     furi_hal_usb_lock();
-    RpcSession* rpc_session = rpc_session_open(rpc);
+    RpcSession* rpc_session = rpc_session_open(rpc, RpcOwnerUsb);
     if(rpc_session == NULL) {
         printf("Session start error\r\n");
         furi_hal_usb_unlock();
diff --git a/applications/services/rpc/rpc_gui.c b/applications/services/rpc/rpc_gui.c
index 0c70702c..9ba20a83 100644
--- a/applications/services/rpc/rpc_gui.c
+++ b/applications/services/rpc/rpc_gui.c
@@ -2,6 +2,7 @@
 #include "rpc_i.h"
 #include "gui.pb.h"
 #include <gui/gui_i.h>
+#include <assets_icons.h>
 
 #define TAG "RpcGui"
 
@@ -31,6 +32,8 @@ typedef struct {
 
     uint32_t input_key_counter[InputKeyMAX];
     uint32_t input_counter;
+
+    ViewPort* rpc_session_active_viewport;
 } RpcGuiSystem;
 
 static const PB_Gui_ScreenOrientation rpc_system_gui_screen_orientation_map[] = {
@@ -352,6 +355,12 @@ static void rpc_system_gui_virtual_display_frame_process(const PB_Main* request,
     (void)session;
 }
 
+static void rpc_active_session_icon_draw_callback(Canvas* canvas, void* context) {
+    UNUSED(context);
+    furi_assert(canvas);
+    canvas_draw_icon(canvas, 0, 0, &I_Rpc_active_7x8);
+}
+
 void* rpc_system_gui_alloc(RpcSession* session) {
     furi_assert(session);
 
@@ -359,6 +368,18 @@ void* rpc_system_gui_alloc(RpcSession* session) {
     rpc_gui->gui = furi_record_open(RECORD_GUI);
     rpc_gui->session = session;
 
+    // Active session icon
+    rpc_gui->rpc_session_active_viewport = view_port_alloc();
+    view_port_set_width(rpc_gui->rpc_session_active_viewport, icon_get_width(&I_Rpc_active_7x8));
+    view_port_draw_callback_set(
+        rpc_gui->rpc_session_active_viewport, rpc_active_session_icon_draw_callback, session);
+    if(rpc_session_get_owner(rpc_gui->session) != RpcOwnerBle) {
+        view_port_enabled_set(rpc_gui->rpc_session_active_viewport, true);
+    } else {
+        view_port_enabled_set(rpc_gui->rpc_session_active_viewport, false);
+    }
+    gui_add_view_port(rpc_gui->gui, rpc_gui->rpc_session_active_viewport, GuiLayerStatusBarLeft);
+
     RpcHandler rpc_handler = {
         .message_handler = NULL,
         .decode_submessage = NULL,
@@ -399,6 +420,9 @@ void rpc_system_gui_free(void* context) {
         rpc_gui->virtual_display_not_empty = false;
     }
 
+    gui_remove_view_port(rpc_gui->gui, rpc_gui->rpc_session_active_viewport);
+    view_port_free(rpc_gui->rpc_session_active_viewport);
+
     if(rpc_gui->is_streaming) {
         rpc_gui->is_streaming = false;
         // Remove GUI framebuffer callback
@@ -415,4 +439,4 @@ void rpc_system_gui_free(void* context) {
     }
     furi_record_close(RECORD_GUI);
     free(rpc_gui);
-}
+}
\ No newline at end of file
diff --git a/assets/icons/StatusBar/Rpc_active_7x8.png b/assets/icons/StatusBar/Rpc_active_7x8.png
new file mode 100644
index 0000000000000000000000000000000000000000..f643a82aa1d2efab26d7e8976bce73124c5c64d2
GIT binary patch
literal 3607
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
TX-MlFYYS&#YHd<t>=yAa5I#)A

literal 0
HcmV?d00001

diff --git a/firmware/targets/f18/api_symbols.csv b/firmware/targets/f18/api_symbols.csv
index 493f5963..a37ef02c 100644
--- a/firmware/targets/f18/api_symbols.csv
+++ b/firmware/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,22.0,,
+Version,+,23.0,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1596,7 +1596,8 @@ Function,-,rindex,char*,"const char*, int"
 Function,+,rpc_session_close,void,RpcSession*
 Function,+,rpc_session_feed,size_t,"RpcSession*, uint8_t*, size_t, TickType_t"
 Function,+,rpc_session_get_available_size,size_t,RpcSession*
-Function,+,rpc_session_open,RpcSession*,Rpc*
+Function,+,rpc_session_get_owner,RpcOwner,RpcSession*
+Function,+,rpc_session_open,RpcSession*,"Rpc*, RpcOwner"
 Function,+,rpc_session_set_buffer_is_empty_callback,void,"RpcSession*, RpcBufferIsEmptyCallback"
 Function,+,rpc_session_set_close_callback,void,"RpcSession*, RpcSessionClosedCallback"
 Function,+,rpc_session_set_context,void,"RpcSession*, void*"
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 3ef57813..43ede425 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,22.0,,
+Version,+,23.0,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -2373,7 +2373,8 @@ Function,-,roundl,long double,long double
 Function,+,rpc_session_close,void,RpcSession*
 Function,+,rpc_session_feed,size_t,"RpcSession*, uint8_t*, size_t, TickType_t"
 Function,+,rpc_session_get_available_size,size_t,RpcSession*
-Function,+,rpc_session_open,RpcSession*,Rpc*
+Function,+,rpc_session_get_owner,RpcOwner,RpcSession*
+Function,+,rpc_session_open,RpcSession*,"Rpc*, RpcOwner"
 Function,+,rpc_session_set_buffer_is_empty_callback,void,"RpcSession*, RpcBufferIsEmptyCallback"
 Function,+,rpc_session_set_close_callback,void,"RpcSession*, RpcSessionClosedCallback"
 Function,+,rpc_session_set_context,void,"RpcSession*, void*"