refactor peer alias

flutter/lib/models/model.dart

@@ -22,7 +22,6 @@ import '../common.dart';
 import '../common/shared_state.dart';
 import '../utils/image.dart' as img;
 import '../mobile/widgets/dialog.dart';
-import 'peer_model.dart';
 import 'platform_model.dart';
 
 typedef HandleMsgBox = Function(Map<String, dynamic> evt, String id);
@@ -1107,23 +1106,6 @@ class FFI {
         id: id, msg: json.encode(modify({'x': '$x2', 'y': '$y2'})));
   }
 
-  /// List the saved peers.
-  Future<List<Peer>> peers() async {
-    try {
-      var str = await bind.mainGetRecentPeers();
-      if (str == '') return [];
-      List<dynamic> peers = json.decode(str);
-      return peers
-          .map((s) => s as List<dynamic>)
-          .map((s) =>
-              Peer.fromJson(s[0] as String, s[1] as Map<String, dynamic>))
-          .toList();
-    } catch (e) {
-      debugPrint('peers(): $e');
-    }
-    return [];
-  }
-
   /// Connect with the given [id]. Only transfer file if [isFileTransfer], only port forward if [isPortForward].
   connect(String id,
       {bool isFileTransfer = false,

flutter/lib/models/peer_model.dart

@@ -7,13 +7,16 @@ class Peer {
   final String username;
   final String hostname;
   final String platform;
+  final String alias;
   final List<dynamic> tags;
   bool online = false;
 
-  Peer.fromJson(this.id, Map<String, dynamic> json)
-      : username = json['username'] ?? '',
+  Peer.fromJson(Map<String, dynamic> json)
+      : id = json['id'] ?? '',
+        username = json['username'] ?? '',
         hostname = json['hostname'] ?? '',
         platform = json['platform'] ?? '',
+        alias = json['alias'] ?? '',
         tags = json['tags'] ?? [];
 
   Peer({
@@ -21,6 +24,7 @@ class Peer {
     required this.username,
     required this.hostname,
     required this.platform,
+    required this.alias,
     required this.tags,
   });
 
@@ -30,6 +34,7 @@ class Peer {
             username: '...',
             hostname: '...',
             platform: '...',
+            alias: '',
             tags: []);
 }
 
@@ -109,11 +114,9 @@ class Peers extends ChangeNotifier {
     try {
       if (peersStr == "") return [];
       List<dynamic> peers = json.decode(peersStr);
-      return peers
-          .map((s) => s as List<dynamic>)
-          .map((s) =>
-              Peer.fromJson(s[0] as String, s[1] as Map<String, dynamic>))
-          .toList();
+      return peers.map((peer) {
+        return Peer.fromJson(peer as Map<String, dynamic>);
+      }).toList();
     } catch (e) {
       debugPrint('peers(): $e');
     }