fix: make event loop in tray compatible with main window

src/platform/delegate.rs

@@ -6,7 +6,7 @@ use cocoa::{
     base::{id, nil, YES},
     foundation::{NSAutoreleasePool, NSString},
 };
-use objc::runtime::Class;
+use objc::runtime::{Class, NO};
 use objc::{
     class,
     declare::ClassDecl,
@@ -107,7 +107,7 @@ pub unsafe fn set_delegate(handler: Option<Box<dyn AppHandler>>) {
     );
     decl.add_method(
         sel!(handleEvent:withReplyEvent:),
-        handle_apple_event as extern "C" fn(&Object, Sel, u64, u64),
+        handle_apple_event as extern "C" fn(&Object, Sel, u64, u64) -> BOOL,
     );
     let decl = decl.register();
     let delegate: id = msg_send![decl, alloc];
@@ -183,11 +183,27 @@ extern "C" fn handle_menu_item(this: &mut Object, _: Sel, item: id) {
     }
 }
 
-extern "C" fn handle_apple_event(_this: &Object, _cmd: Sel, event: u64, _reply: u64) {
+#[no_mangle]
+extern "C" fn handle_apple_event(_this: &Object, _cmd: Sel, event: u64, _reply: u64) -> BOOL {
     let event = event as *mut Object;
     let url = fruitbasket::parse_url_event(event);
     log::debug!("an event was received: {}", url);
     std::thread::spawn(move || crate::handle_url_scheme(url));
+    YES
+}
+
+// Customize the service opening logic.
+#[no_mangle]
+fn service_should_handle_reopen(
+    obj: &Object,
+    sel: Sel,
+    sender: id,
+    has_visible_windows: BOOL,
+  ) -> BOOL {
+    log::debug!("Invoking the main rustdesk process");
+    std::thread::spawn(move || crate::handle_url_scheme("".to_string())); 
+    // Prevent default logic. 
+    NO
 }
 
 unsafe fn make_menu_item(title: &str, key: &str, tag: u32) -> *mut Object {

src/server.rs

@@ -454,7 +454,7 @@ pub async fn start_ipc_url_server() {
                             let mut m = HashMap::new();
                             m.insert("name", "on_url_scheme_received");
                             m.insert("url", url.as_str());
-                            let event = serde_json::to_string(&m).unwrap();
+                            let event = serde_json::to_string(&m).unwrap_or("".to_owned());
                             match crate::flutter::push_global_event(crate::flutter::APP_TYPE_MAIN, event) {
                                 None => log::warn!("No main window app found!"),
                                 Some(..) => {}

src/tray.rs

@@ -131,10 +131,6 @@ pub fn make_tray() -> hbb_common::ResultType<()> {
 
     let event_loop = EventLoopBuilder::new().build();
 
-    unsafe {
-        crate::platform::delegate::set_delegate(None);
-    }
-
     let tray_menu = Menu::new();
     let quit_i = MenuItem::new(crate::client::translate("Exit".to_owned()), true, None);
     tray_menu.append_items(&[&quit_i]);