From c13c89c0d6f09a14daea21b4a2e4cf5dd4bd4dff Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Fri, 3 Feb 2023 18:52:22 +0800
Subject: [PATCH] fix: uni links cause main window show

---
 flutter/lib/common.dart | 17 ++++++++++-------
 flutter/lib/main.dart   |  7 +++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index c058ec434..7e22e0848 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1272,9 +1272,9 @@ Future<bool> restoreWindowPosition(WindowType type, {int? windowId}) async {
 /// [Availability]
 /// initUniLinks should only be used on macos/windows.
 /// we use dbus for linux currently.
-Future<void> initUniLinks() async {
+Future<bool> initUniLinks() async {
   if (Platform.isLinux) {
-    return;
+    return false;
   }
   // Register uni links for Windows. The required info of url scheme is already
   // declared in `Info.plist` for macOS.
@@ -1285,11 +1285,12 @@ Future<void> initUniLinks() async {
   try {
     final initialLink = await getInitialLink();
     if (initialLink == null) {
-      return;
+      return false;
     }
-    parseRustdeskUri(initialLink);
+    return parseRustdeskUri(initialLink);
   } catch (err) {
     debugPrintStack(label: "$err");
+    return false;
   }
 }
 
@@ -1310,11 +1311,13 @@ StreamSubscription? listenUniLinks() {
   return sub;
 }
 
-/// Returns true if we successfully handle the startup arguments.
+/// Handle command line arguments
+///
+/// * Returns true if we successfully handle the startup arguments.
 bool checkArguments() {
   // bootArgs:[--connect, 362587269, --switch_uuid, e3d531cc-5dce-41e0-bd06-5d4a2b1eec05]
   // check connect args
-  final connectIndex = kBootArgs.indexOf("--connect");
+  var connectIndex = kBootArgs.indexOf("--connect");
   if (connectIndex == -1) {
     return false;
   }
@@ -1368,7 +1371,7 @@ bool callUniLinksUriHandler(Uri uri) {
     Future.delayed(Duration.zero, () {
       rustDeskWinManager.newRemoteDesktop(peerId, switch_uuid: switch_uuid);
     });
-    return false;
+    return true;
   }
   return false;
 }
diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index b41cc17df..67a243eff 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -114,7 +114,6 @@ Future<void> initEnv(String appType) async {
 
 void runMainApp(bool startService) async {
   // register uni links
-  initUniLinks();
   await initEnv(kAppTypeMain);
   // trigger connection status updater
   await bind.mainCheckConnectStatus();
@@ -130,7 +129,11 @@ void runMainApp(bool startService) async {
     // Restore the location of the main window before window hide or show.
     await restoreWindowPosition(WindowType.Main);
     // Check the startup argument, if we successfully handle the argument, we keep the main window hidden.
-    if (checkArguments()) {
+    final handledByUniLinks = await initUniLinks();
+    final handledByCli = checkArguments();
+    debugPrint(
+        "handled by uni links: $handledByUniLinks, handled by cli: $handledByCli");
+    if (handledByUniLinks || handledByCli) {
       windowManager.hide();
     } else {
       windowManager.show();