Merge branch 'master' of github.com-rustdesk:rustdesk/rustdesk

2025-10-29 17:00:05 +00:00 · 2022-09-15 17:41:45 +08:00
parent f4871a992f 741dc182ed
commit 3730ed0cc3
10 changed files with 97 additions and 86 deletions
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -414,7 +414,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
            );
          } else {
            if (model.abLoading) {
-              return Center(
+              return const Center(
                child: CircularProgressIndicator(),
              );
            } else if (model.abError.isNotEmpty) {
@@ -782,6 +782,7 @@ class _PeerTabbedPageState extends State<_PeerTabbedPage>
        bind.mainDiscover();
        break;
      case 3:
+        gFFI.abModel.updateAb();
        break;
    }
  }
--- a/flutter/lib/desktop/widgets/peer_widget.dart
+++ b/flutter/lib/desktop/widgets/peer_widget.dart
@@ -43,7 +43,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
  final _curPeers = <String>{};
  var _lastChangeTime = DateTime.now();
  var _lastQueryPeers = <String>{};
-  var _lastQueryTime = DateTime.now().subtract(Duration(hours: 1));
+  var _lastQueryTime = DateTime.now().subtract(const Duration(hours: 1));
  var _queryCoun = 0;
  var _exit = false;

@@ -143,8 +143,8 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
      while (!_exit) {
        final now = DateTime.now();
        if (!setEquals(_curPeers, _lastQueryPeers)) {
-          if (now.difference(_lastChangeTime) > Duration(seconds: 1)) {
-            if (_curPeers.length > 0) {
+          if (now.difference(_lastChangeTime) > const Duration(seconds: 1)) {
+            if (_curPeers.isNotEmpty) {
              platformFFI.ffiBind
                  .queryOnlines(ids: _curPeers.toList(growable: false));
              _lastQueryPeers = {..._curPeers};
@@ -154,8 +154,8 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
          }
        } else {
          if (_queryCoun < _maxQueryCount) {
-            if (now.difference(_lastQueryTime) > Duration(seconds: 20)) {
-              if (_curPeers.length > 0) {
+            if (now.difference(_lastQueryTime) > const Duration(seconds: 20)) {
+              if (_curPeers.isNotEmpty) {
                platformFFI.ffiBind
                    .queryOnlines(ids: _curPeers.toList(growable: false));
                _lastQueryTime = DateTime.now();
@@ -164,7 +164,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
            }
          }
        }
-        await Future.delayed(Duration(milliseconds: 300));
+        await Future.delayed(const Duration(milliseconds: 300));
      }
    }();
  }
@@ -266,7 +266,7 @@ class AddressBookPeerWidget extends BasePeerWidget {
          loadEvent: 'load_address_book_peers',
          offstageFunc: (Peer peer) =>
              !_hitTag(gFFI.abModel.selectedTags, peer.tags),
-          peerCardWidgetFunc: (Peer peer) => DiscoveredPeerCard(
+          peerCardWidgetFunc: (Peer peer) => AddressBookPeerCard(
            peer: peer,
          ),
          initPeers: _loadPeers(),
@@ -292,4 +292,11 @@ class AddressBookPeerWidget extends BasePeerWidget {
    }
    return true;
  }
+
+  @override
+  Widget build(BuildContext context) {
+    final widget = super.build(context);
+    gFFI.abModel.updateAb();
+    return widget;
+  }
 }
--- a/flutter/lib/desktop/widgets/peercard_widget.dart
+++ b/flutter/lib/desktop/widgets/peercard_widget.dart
@@ -113,15 +113,16 @@ class _PeerCardState extends State<_PeerCard>
                        children: [
                          Row(children: [
                            Padding(
-                                padding: EdgeInsets.fromLTRB(0, 4, 4, 4),
+                                padding: const EdgeInsets.fromLTRB(0, 4, 4, 4),
                                child: CircleAvatar(
                                    radius: 5,
                                    backgroundColor: peer.online
                                        ? Colors.green
                                        : Colors.yellow)),
                            Text(
-                              formatID('${peer.id}'),
-                              style: TextStyle(fontWeight: FontWeight.w400),
+                              formatID(peer.id),
+                              style:
+                                  const TextStyle(fontWeight: FontWeight.w400),
                            ),
                          ]),
                          Align(
@@ -136,7 +137,7 @@ class _PeerCardState extends State<_PeerCard>
                                      : snapshot.data!;
                                  return Tooltip(
                                    message: name,
-                                    waitDuration: Duration(seconds: 1),
+                                    waitDuration: const Duration(seconds: 1),
                                    child: Text(
                                      name,
                                      style: greyStyle,
@@ -208,10 +209,11 @@ class _PeerCardState extends State<_PeerCard>
                                          : widget.alias.value;
                                      return Tooltip(
                                        message: name,
-                                        waitDuration: Duration(seconds: 1),
+                                        waitDuration:
+                                            const Duration(seconds: 1),
                                        child: Text(
                                          name,
-                                          style: TextStyle(
+                                          style: const TextStyle(
                                              color: Colors.white70,
                                              fontSize: 12),
                                          textAlign: TextAlign.center,
@@ -236,7 +238,7 @@ class _PeerCardState extends State<_PeerCard>
                    children: [
                      Row(children: [
                        Padding(
-                            padding: EdgeInsets.fromLTRB(0, 4, 8, 4),
+                            padding: const EdgeInsets.fromLTRB(0, 4, 8, 4),
                            child: CircleAvatar(
                                radius: 5,
                                backgroundColor: peer.online
@@ -501,7 +503,7 @@ abstract class BasePeerCard extends StatelessWidget {
          final favs = (await bind.mainGetFav()).toList();
          if (!favs.contains(id)) {
            favs.add(id);
-            bind.mainStoreFav(favs: favs);
+            await bind.mainStoreFav(favs: favs);
          }
        }();
      },
@@ -510,7 +512,8 @@ abstract class BasePeerCard extends StatelessWidget {
  }

  @protected
-  MenuEntryBase<String> _rmFavAction(String id) {
+  MenuEntryBase<String> _rmFavAction(
+      String id, Future<void> Function() reloadFunc) {
    return MenuEntryButton<String>(
      childBuilder: (TextStyle? style) => Text(
        translate('Remove from Favorites'),
@@ -520,8 +523,9 @@ abstract class BasePeerCard extends StatelessWidget {
        () async {
          final favs = (await bind.mainGetFav()).toList();
          if (favs.remove(id)) {
-            bind.mainStoreFav(favs: favs);
-            Get.forceAppUpdate(); // TODO use inner model / state
+            await bind.mainStoreFav(favs: favs);
+            await reloadFunc();
+            // Get.forceAppUpdate(); // TODO use inner model / state
          }
        }();
      },
@@ -646,7 +650,9 @@ class FavoritePeerCard extends BasePeerCard {
      await bind.mainLoadFavPeers();
    }));
    menuItems.add(_unrememberPasswordAction(peer.id));
-    menuItems.add(_rmFavAction(peer.id));
+    menuItems.add(_rmFavAction(peer.id, () async {
+      await bind.mainLoadFavPeers();
+    }));
    return menuItems;
  }
 }
@@ -817,8 +823,8 @@ class AddressBookPeerCard extends BasePeerCard {
                color: rxTags.contains(tagName) ? Colors.blue : null,
                border: Border.all(color: MyTheme.darkGray),
                borderRadius: BorderRadius.circular(10)),
-            margin: EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
-            padding: EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0),
+            margin: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 8.0),
+            padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 8.0),
            child: Text(
              tagName,
              style: TextStyle(
@@ -831,38 +837,6 @@ class AddressBookPeerCard extends BasePeerCard {
  }
 }

-Future<PopupMenuItem<String>> _forceAlwaysRelayMenuItem(String id) async {
-  bool force_always_relay =
-      (await bind.mainGetPeerOption(id: id, key: 'force-always-relay'))
-          .isNotEmpty;
-  return PopupMenuItem<String>(
-      child: Row(
-        children: [
-          Offstage(
-            offstage: !force_always_relay,
-            child: Icon(Icons.check),
-          ),
-          Text(translate('Always connect via relay')),
-        ],
-      ),
-      value: 'force-always-relay');
-}
-
-PopupMenuItem<String> _rdpMenuItem(String id) {
-  return PopupMenuItem<String>(
-      child: Row(
-        children: [
-          Text('RDP'),
-          SizedBox(width: 20),
-          IconButton(
-            icon: Icon(Icons.edit),
-            onPressed: () => _rdpDialog(id),
-          )
-        ],
-      ),
-      value: 'RDP');
-}
-
 void _rdpDialog(String id) async {
  final portController = TextEditingController(
      text: await bind.mainGetPeerOption(id: id, key: 'rdp_port'));
--- a/flutter/lib/models/ab_model.dart
+++ b/flutter/lib/models/ab_model.dart
@@ -28,21 +28,26 @@ class AbModel with ChangeNotifier {
    try {
      final resp =
          await http.post(Uri.parse(api), headers: await _getHeaders());
-      Map<String, dynamic> json = jsonDecode(resp.body);
-      if (json.containsKey('error')) {
-        abError = json['error'];
-      } else if (json.containsKey('data')) {
-        final data = jsonDecode(json['data']);
-        tags.value = data['tags'];
-        peers.value = data['peers'];
+      if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
+        Map<String, dynamic> json = jsonDecode(resp.body);
+        if (json.containsKey('error')) {
+          abError = json['error'];
+        } else if (json.containsKey('data')) {
+          final data = jsonDecode(json['data']);
+          tags.value = data['tags'];
+          peers.value = data['peers'];
+        }
+        notifyListeners();
+        return resp.body;
+      } else {
+        return "";
      }
-      return resp.body;
    } catch (err) {
      abError = err.toString();
    } finally {
+      notifyListeners();
      abLoading = false;
    }
-    notifyListeners();
    return null;
  }

@@ -60,7 +65,6 @@ class AbModel with ChangeNotifier {
    return _ffi?.getHttpHeaders();
  }

-  ///
  void addId(String id) async {
    if (idContainBy(id)) {
      return;
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@@ -70,7 +70,7 @@ packages:
      name: build
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
  build_config:
    dependency: transitive
    description:
@@ -91,21 +91,21 @@ packages:
      name: build_resolvers
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.10"
  build_runner:
    dependency: "direct dev"
    description:
      name: build_runner
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
  build_runner_core:
    dependency: transitive
    description:
      name: build_runner_core
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "7.2.3"
+    version: "7.2.4"
  built_collection:
    dependency: transitive
    description:
@@ -973,7 +973,7 @@ packages:
      name: source_gen
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
  source_span:
    dependency: transitive
    description: