From dd90096e1338e0257e85c5e9fcd60137aaa7a8b6 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 10 Jun 2024 16:12:08 +0800
Subject: [PATCH] remove useless stop-rendezvous-service

---
 flutter/lib/common.dart       | 14 ++++++--------
 libs/hbb_common/src/config.rs |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index d75805fe9..06dfec194 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1430,9 +1430,8 @@ bool option2bool(String option, String value) {
   if (option.startsWith("enable-")) {
     res = value != "N";
   } else if (option.startsWith("allow-") ||
-      option == kOptionStopService ||
+      option == "stop-service" ||
       option == kOptionDirectServer ||
-      option == "stop-rendezvous-service" ||
       option == kOptionForceAlwaysRelay) {
     res = value == "Y";
   } else {
@@ -1447,9 +1446,8 @@ String bool2option(String option, bool b) {
   if (option.startsWith('enable-')) {
     res = b ? defaultOptionYes : 'N';
   } else if (option.startsWith('allow-') ||
-      option == kOptionStopService ||
+      option == "stop-service" ||
       option == kOptionDirectServer ||
-      option == "stop-rendezvous-service" ||
       option == kOptionForceAlwaysRelay) {
     res = b ? 'Y' : defaultOptionNo;
   } else {
@@ -1485,9 +1483,9 @@ bool mainGetPeerBoolOptionSync(String id, String key) {
   return option2bool(key, bind.mainGetPeerOptionSync(id: id, key: key));
 }
 
-// Don't use `option2bool()` and `bool2option()` to convert the session option.
-// Use `sessionGetToggleOption()` and `sessionToggleOption()` instead.
-// Because all session options use `Y` and `<Empty>` as values.
+mainSetPeerBoolOptionSync(String id, String key, bool v) {
+  bind.mainSetPeerOptionSync(id: id, key: key, value: bool2option(key, v));
+}
 
 Future<bool> matchPeer(String searchText, Peer peer) async {
   if (searchText.isEmpty) {
@@ -2672,7 +2670,7 @@ Future<void> start_service(bool is_start) async {
       !isMacOS ||
       await callMainCheckSuperUserPermission();
   if (checked) {
-    mainSetBoolOption(kOptionStopService, !is_start);
+    bind.mainSetOption(key: "stop-service", value: is_start ? "" : "Y");
   }
 }
 
diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
index 02a0f66ec..cd5d4c565 100644
--- a/libs/hbb_common/src/config.rs
+++ b/libs/hbb_common/src/config.rs
@@ -2027,7 +2027,6 @@ pub fn option2bool(option: &str, value: &str) -> bool {
     } else if option.starts_with("allow-")
         || option == "stop-service"
         || option == keys::OPTION_DIRECT_SERVER
-        || option == "stop-rendezvous-service"
         || option == "force-always-relay"
     {
         value == "Y"