From a5d56fcd3f2c2f566e13caa24d83e1781a29ea1a Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Tue, 6 Jun 2023 21:51:40 +0800
Subject: [PATCH] refactor service start/stop

---
 flutter/lib/common.dart                       |  9 +++
 .../lib/desktop/pages/connection_page.dart    |  7 +--
 .../desktop/pages/desktop_setting_page.dart   | 57 +++++++++----------
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 1ccf2d7b5..ac417c17e 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -2043,3 +2043,12 @@ void onCopyFingerprint(String value) {
     showToast(translate("no fingerprints"));
   }
 }
+
+Future<void> start_service(bool is_start) async {
+  bool checked = !bind.mainIsInstalled() ||
+      !Platform.isMacOS ||
+      await bind.mainCheckSuperUserPermission();
+  if (checked) {
+    bind.mainSetOption(key: "stop-service", value: is_start ? "" : "Y");
+  }
+}
diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart
index d709d3c52..6d3f8994c 100644
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -274,12 +274,7 @@ class _ConnectionPageState extends State<ConnectionPage>
                 offstage: !svcStopped.value,
                 child: InkWell(
                         onTap: () async {
-                          bool checked = !bind.mainIsInstalled() ||
-                              await bind.mainCheckSuperUserPermission();
-                          if (checked) {
-                            bind.mainSetOption(key: "stop-service", value: "");
-                            bind.mainSetOption(key: "access-mode", value: "");
-                          }
+                          await start_service(true);
                         },
                         child: Text(translate("Start Service"),
                             style: TextStyle(
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 2cb2f5d54..0cb13154d 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -247,6 +247,9 @@ class _General extends StatefulWidget {
 }
 
 class _GeneralState extends State<_General> {
+  final RxBool serviceStop = Get.find<RxBool>(tag: 'stop-service');
+  RxBool serviceBtnEabled = true.obs;
+
   @override
   Widget build(BuildContext context) {
     final scrollController = ScrollController();
@@ -256,6 +259,7 @@ class _GeneralState extends State<_General> {
           physics: DraggableNeverScrollableScrollPhysics(),
           controller: scrollController,
           children: [
+            service(),
             theme(),
             hwcodec(),
             audio(context),
@@ -292,6 +296,21 @@ class _GeneralState extends State<_General> {
     ]);
   }
 
+  Widget service() {
+    return _Card(title: 'Service', children: [
+      Obx(() => _Button(serviceStop.value ? 'Start' : 'Stop', () {
+            () async {
+              serviceBtnEabled.value = false;
+              await start_service(serviceStop.value);
+              // enable the button after 1 second
+              Future.delayed(const Duration(seconds: 1), () {
+                serviceBtnEabled.value = true;
+              });
+            }();
+          }, enabled: serviceBtnEabled.value))
+    ]);
+  }
+
   Widget other() {
     return _Card(title: 'Other', children: [
       _OptionCheckBox(context, 'Confirm before closing multiple tabs',
@@ -457,7 +476,6 @@ enum _AccessMode {
   custom,
   full,
   view,
-  deny,
 }
 
 class _Safety extends StatefulWidget {
@@ -510,22 +528,18 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
   }
 
   Widget _permissions(context, bool stopService) {
-    bool enabled = !locked;
+    bool enabled = !locked && stopService;
     return futureBuilder(future: () async {
       return await bind.mainGetOption(key: 'access-mode');
     }(), hasData: (data) {
       String accessMode = data! as String;
       _AccessMode mode;
-      if (stopService) {
-        mode = _AccessMode.deny;
+      if (accessMode == 'full') {
+        mode = _AccessMode.full;
+      } else if (accessMode == 'view') {
+        mode = _AccessMode.view;
       } else {
-        if (accessMode == 'full') {
-          mode = _AccessMode.full;
-        } else if (accessMode == 'view') {
-          mode = _AccessMode.view;
-        } else {
-          mode = _AccessMode.custom;
-        }
+        mode = _AccessMode.custom;
       }
       String initialKey;
       bool? fakeValue;
@@ -542,10 +556,6 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
           initialKey = 'view';
           fakeValue = false;
           break;
-        case _AccessMode.deny:
-          initialKey = 'deny';
-          fakeValue = false;
-          break;
       }
 
       return _Card(title: 'Permissions', children: [
@@ -554,34 +564,19 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
               '',
               'full',
               'view',
-              'deny'
             ],
             values: [
               translate('Custom'),
               translate('Full Access'),
               translate('Screen Share'),
-              translate('Deny remote access'),
             ],
             enabled: enabled,
             initialKey: initialKey,
             onChanged: (mode) async {
-              String modeValue;
-              bool stopService;
-              if (mode == 'deny') {
-                modeValue = '';
-                stopService = true;
-              } else {
-                modeValue = mode;
-                stopService = false;
-              }
-              await bind.mainSetOption(key: 'access-mode', value: modeValue);
-              await bind.mainSetOption(
-                  key: 'stop-service',
-                  value: bool2option('stop-service', stopService));
+              await bind.mainSetOption(key: 'access-mode', value: mode);
               setState(() {});
             }).marginOnly(left: _kContentHMargin),
         Offstage(
-          offstage: mode == _AccessMode.deny,
           child: Column(
             children: [
               _OptionCheckBox(