From a6deacb92b18435e399cb619ade84b459e745d71 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Fri, 10 Mar 2023 15:25:19 +0800
Subject: [PATCH] remove alias and disable status in peer card sort

---
 flutter/lib/common/widgets/peers_view.dart | 18 ++++++------------
 flutter/lib/models/peer_model.dart         |  7 +++++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart
index 197e55376..71cd5d999 100644
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -19,16 +19,14 @@ typedef PeerCardBuilder = Widget Function(Peer peer);
 class PeerSortType {
   static const String remoteId = 'Remote ID';
   static const String remoteHost = 'Remote Host';
-  static const String alias = 'Alias';
   static const String username = 'Username';
-  static const String status = 'Status';
+  // static const String status = 'Status';
 
   static List<String> values = [
     PeerSortType.remoteId,
     PeerSortType.remoteHost,
-    PeerSortType.alias,
     PeerSortType.username,
-    PeerSortType.status
+    // PeerSortType.status
   ];
 }
 
@@ -226,23 +224,19 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
     if (widget.peers.loadEvent != 'load_recent_peers') {
       switch (sortedBy) {
         case PeerSortType.remoteId:
-          peers.sort((p1, p2) => p1.id.compareTo(p2.id));
+          peers.sort((p1, p2) => p1.getId().compareTo(p2.getId()));
           break;
         case PeerSortType.remoteHost:
           peers.sort((p1, p2) =>
               p1.hostname.toLowerCase().compareTo(p2.hostname.toLowerCase()));
           break;
-        case PeerSortType.alias:
-          peers.sort((p1, p2) =>
-              p1.alias.toLowerCase().compareTo(p2.alias.toLowerCase()));
-          break;
         case PeerSortType.username:
           peers.sort((p1, p2) =>
               p1.username.toLowerCase().compareTo(p2.username.toLowerCase()));
           break;
-        case PeerSortType.status:
-          peers.sort((p1, p2) => p1.online ? -1 : 1);
-          break;
+        // case PeerSortType.status:
+        // peers.sort((p1, p2) => p1.online ? -1 : 1);
+        // break;
       }
     }
 
diff --git a/flutter/lib/models/peer_model.dart b/flutter/lib/models/peer_model.dart
index ad5183ae3..1b71e382e 100644
--- a/flutter/lib/models/peer_model.dart
+++ b/flutter/lib/models/peer_model.dart
@@ -14,6 +14,13 @@ class Peer {
   String rdpUsername;
   bool online = false;
 
+  String getId() {
+    if (alias != '') {
+      return alias;
+    }
+    return id;
+  }
+
   Peer.fromJson(Map<String, dynamic> json)
       : id = json['id'] ?? '',
         username = json['username'] ?? '',