lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-11 18:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix ab sync judge

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-08-16 22:43:17 +08:00
parent 9ac4346850
commit 8e9f3e2b4d
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flutter/lib/models/ab_model.dart
View File

@@ -380,12 +380,12 @@ class AbModel {
}
Future<void> _syncFromRecentWithoutLock({bool push = true}) async {
bool shouldSync(Peer r, Peer p) {
return r.hash != p.hash ||
r.username != p.username ||
r.platform != p.platform ||
r.hostname != p.hostname ||
(p.alias.isEmpty && r.alias.isNotEmpty);
bool peerSyncEqual(Peer a, Peer b) {
return a.hash == b.hash &&
a.username == b.username &&
a.platform == b.platform &&
a.hostname == b.hostname &&
a.alias == b.alias;
}
Future<List<Peer>> getRecentPeers() async {
@@ -425,29 +425,30 @@ class AbModel {
if (!shouldSyncAb()) return;
final recents = await getRecentPeers();
if (recents.isEmpty) return;
bool syncChanged = false;
bool uiChanged = false;
bool needSync = false;
for (var i = 0; i < recents.length; i++) {
var r = recents[i];
var index = peers.indexWhere((e) => e.id == r.id);
if (index < 0) {
if (!isFull(false)) {
peers.add(r);
syncChanged = true;
uiChanged = true;
needSync = true;
}
} else {
if (!r.equal(peers[index])) {
uiChanged = true;
}
if (shouldSync(r, peers[index])) {
syncChanged = true;
}
Peer old = Peer.copy(peers[index]);
peers[index] = merge(r, peers[index]);
if (!peerSyncEqual(peers[index], old)) {
needSync = true;
}
}
}
// Be careful with loop calls
if (syncChanged && push) {
if (needSync && push) {
pushAb(toastIfSucc: false, toastIfFail: false);
} else if (uiChanged) {
peers.refresh();