From 51b62ea4670d9120c4bb9cfa3ab997394ae61794 Mon Sep 17 00:00:00 2001 From: 21pages Date: Thu, 21 Sep 2023 16:34:04 +0800 Subject: [PATCH] merge info from group when add id to addressbook Signed-off-by: 21pages --- flutter/lib/models/ab_model.dart | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart index 6968b2f10..bf638c767 100644 --- a/flutter/lib/models/ab_model.dart +++ b/flutter/lib/models/ab_model.dart @@ -132,6 +132,7 @@ class AbModel { 'alias': alias, 'tags': tags, }); + _mergePeerFromGroup(peer); peers.add(peer); } @@ -573,4 +574,18 @@ class AbModel { peers.clear(); await bind.mainClearAb(); } + + _mergePeerFromGroup(Peer p) { + final g = gFFI.groupModel.peers.firstWhereOrNull((e) => p.id == e.id); + if (g == null) return; + if (p.username.isEmpty) { + p.username = g.username; + } + if (p.hostname.isEmpty) { + p.hostname = g.hostname; + } + if (p.platform.isEmpty) { + p.platform = g.platform; + } + } }