From f5e0475bdf3ce85be6854713edef4b9b2b167e90 Mon Sep 17 00:00:00 2001 From: Timothy Date: Sun, 18 Jul 2021 23:48:52 +1000 Subject: [PATCH] FileSystemAccessServer: Add expose_window_server_client_id() This will expose the client id of the WindowServerConnection this instance of FileSystemAccessServer is using. --- .../Services/FileSystemAccessServer/ClientConnection.cpp | 5 +++++ Userland/Services/FileSystemAccessServer/ClientConnection.h | 2 ++ .../FileSystemAccessServer/FileSystemAccessServer.ipc | 2 ++ 3 files changed, 9 insertions(+) diff --git a/Userland/Services/FileSystemAccessServer/ClientConnection.cpp b/Userland/Services/FileSystemAccessServer/ClientConnection.cpp index aaa2e780556..2a5939a590a 100644 --- a/Userland/Services/FileSystemAccessServer/ClientConnection.cpp +++ b/Userland/Services/FileSystemAccessServer/ClientConnection.cpp @@ -157,4 +157,9 @@ void ClientConnection::prompt_helper(Optional const& user_picked_file, C } } +Messages::FileSystemAccessServer::ExposeWindowServerClientIdResponse ClientConnection::expose_window_server_client_id() +{ + return GUI::WindowServerConnection::the().expose_client_id(); +} + } diff --git a/Userland/Services/FileSystemAccessServer/ClientConnection.h b/Userland/Services/FileSystemAccessServer/ClientConnection.h index 9261bc029cc..4dc3f77ef6b 100644 --- a/Userland/Services/FileSystemAccessServer/ClientConnection.h +++ b/Userland/Services/FileSystemAccessServer/ClientConnection.h @@ -33,6 +33,8 @@ private: void prompt_helper(Optional const&, Core::OpenMode const&); RefPtr create_dummy_child_window(i32, i32); + virtual Messages::FileSystemAccessServer::ExposeWindowServerClientIdResponse expose_window_server_client_id() override; + HashMap m_approved_files; }; diff --git a/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc b/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc index 15c3735d8e6..9b0d68b4c0c 100644 --- a/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc +++ b/Userland/Services/FileSystemAccessServer/FileSystemAccessServer.ipc @@ -6,4 +6,6 @@ endpoint FileSystemAccessServer request_file(i32 window_server_client_id, i32 window_id, String path, Core::OpenMode requested_access) =| prompt_open_file(i32 window_server_client_id, i32 window_id, String path_to_view, Core::OpenMode requested_access) =| prompt_save_file(i32 window_server_client_id, i32 window_id,String title, String ext, String path_to_view, Core::OpenMode requested_access) =| + + expose_window_server_client_id() => (i32 client_id) }