hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flutter_desktop: fix peer page bugs

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2022-09-01 06:18:29 -07:00
parent ec02f9e721
commit 9085a93888
9 changed files with 208 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flutter/lib/desktop/pages/connection_page.dart
View File

@ -33,7 +33,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
final _idController = TextEditingController(); final _idController = TextEditingController();
/// Update url. If it's not null, means an update is available. /// Update url. If it's not null, means an update is available.
var _updateUrl = ''; final _updateUrl = '';
Timer? _updateTimer; Timer? _updateTimer;
@ -92,7 +92,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
if (snapshot.hasData) { if (snapshot.hasData) {
return snapshot.data!; return snapshot.data!;
} else { } else {
return Offstage(); return const Offstage();
} }
}), }),
], ],
@ -110,7 +110,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
/// Callback for the connect button. /// Callback for the connect button.
/// Connects to the selected peer. /// Connects to the selected peer.
void onConnect({bool isFileTransfer = false}) { void onConnect({bool isFileTransfer = false}) {
var id = _idController.text.trim(); final id = _idController.text.trim();
connect(id, isFileTransfer: isFileTransfer); connect(id, isFileTransfer: isFileTransfer);
} }
@ -120,9 +120,9 @@ class _ConnectionPageState extends State<ConnectionPage> {
if (id == '') return; if (id == '') return;
id = id.replaceAll(' ', ''); id = id.replaceAll(' ', '');
if (isFileTransfer) { if (isFileTransfer) {
await rustDeskWinManager.new_file_transfer(id); await rustDeskWinManager.newFileTransfer(id);
} else { } else {
await rustDeskWinManager.new_remote_desktop(id); await rustDeskWinManager.newRemoteDesktop(id);
} }
FocusScopeNode currentFocus = FocusScope.of(context); FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus) { if (!currentFocus.hasPrimaryFocus) {

141
flutter/lib/desktop/widgets/peer_widget.dart
View File

@ -21,18 +21,16 @@ final peerSearchTextController =
TextEditingController(text: peerSearchText.value); TextEditingController(text: peerSearchText.value);
class _PeerWidget extends StatefulWidget { class _PeerWidget extends StatefulWidget {
late final _peers; final Peers peers;
late final OffstageFunc _offstageFunc; final OffstageFunc offstageFunc;
late final PeerCardWidgetFunc _peerCardWidgetFunc; final PeerCardWidgetFunc peerCardWidgetFunc;
_PeerWidget(Peers peers, OffstageFunc offstageFunc, const _PeerWidget(
PeerCardWidgetFunc peerCardWidgetFunc, {required this.peers,
{Key? key}) required this.offstageFunc,
: super(key: key) { required this.peerCardWidgetFunc,
_peers = peers; Key? key})
_offstageFunc = offstageFunc; : super(key: key);
_peerCardWidgetFunc = peerCardWidgetFunc;
}
@override @override
_PeerWidgetState createState() => _PeerWidgetState(); _PeerWidgetState createState() => _PeerWidgetState();
@ -42,9 +40,9 @@ class _PeerWidget extends StatefulWidget {
class _PeerWidgetState extends State<_PeerWidget> with WindowListener { class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
static const int _maxQueryCount = 3; static const int _maxQueryCount = 3;
var _curPeers = Set<String>(); final _curPeers = <String>{};
var _lastChangeTime = DateTime.now(); var _lastChangeTime = DateTime.now();
var _lastQueryPeers = Set<String>(); var _lastQueryPeers = <String>{};
var _lastQueryTime = DateTime.now().subtract(Duration(hours: 1)); var _lastQueryTime = DateTime.now().subtract(Duration(hours: 1));
var _queryCoun = 0; var _queryCoun = 0;
var _exit = false; var _exit = false;
@ -78,9 +76,9 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final space = 12.0; const space = 12.0;
return ChangeNotifierProvider<Peers>( return ChangeNotifierProvider<Peers>(
create: (context) => super.widget._peers, create: (context) => widget.peers,
child: Consumer<Peers>( child: Consumer<Peers>(
builder: (context, peers, child) => peers.peers.isEmpty builder: (context, peers, child) => peers.peers.isEmpty
? Center( ? Center(
@ -96,7 +94,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
for (final peer in peers) { for (final peer in peers) {
cards.add(Offstage( cards.add(Offstage(
key: ValueKey("off${peer.id}"), key: ValueKey("off${peer.id}"),
offstage: super.widget._offstageFunc(peer), offstage: widget.offstageFunc(peer),
child: Obx( child: Obx(
() => SizedBox( () => SizedBox(
width: 220, width: 220,
@ -116,17 +114,13 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
} }
_lastChangeTime = DateTime.now(); _lastChangeTime = DateTime.now();
}, },
child: super child: widget.peerCardWidgetFunc(peer),
.widget
._peerCardWidgetFunc(peer),
), ),
), ),
))); )));
} }
return Wrap( return Wrap(
spacing: space, spacing: space, runSpacing: space, children: cards);
runSpacing: space,
children: cards);
} else { } else {
return const Center( return const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
@ -136,7 +130,8 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
future: matchPeers(searchText.value, peers.peers), future: matchPeers(searchText.value, peers.peers),
); );
}, peerSearchText), }, peerSearchText),
)), ),
),
); );
} }
@ -175,31 +170,42 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
} }
abstract class BasePeerWidget extends StatelessWidget { abstract class BasePeerWidget extends StatelessWidget {
late final _name; final String name;
late final _loadEvent; final String loadEvent;
late final OffstageFunc _offstageFunc; final OffstageFunc offstageFunc;
late final PeerCardWidgetFunc _peerCardWidgetFunc; final PeerCardWidgetFunc peerCardWidgetFunc;
late final List<Peer> _initPeers; final List<Peer> initPeers;
BasePeerWidget({Key? key}) : super(key: key) {} const BasePeerWidget({
Key? key,
required this.name,
required this.loadEvent,
required this.offstageFunc,
required this.peerCardWidgetFunc,
required this.initPeers,
}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return _PeerWidget(Peers(_name, _loadEvent, _initPeers), _offstageFunc, return _PeerWidget(
_peerCardWidgetFunc); peers: Peers(name: name, loadEvent: loadEvent, peers: initPeers),
offstageFunc: offstageFunc,
peerCardWidgetFunc: peerCardWidgetFunc);
} }
} }
class RecentPeerWidget extends BasePeerWidget { class RecentPeerWidget extends BasePeerWidget {
RecentPeerWidget({Key? key}) : super(key: key) { RecentPeerWidget({Key? key})
super._name = "recent peer"; : super(
super._loadEvent = "load_recent_peers"; key: key,
super._offstageFunc = (Peer _peer) => false; name: 'recent peer',
super._peerCardWidgetFunc = (Peer peer) => RecentPeerCard( loadEvent: 'load_recent_peers',
offstageFunc: (Peer peer) => false,
peerCardWidgetFunc: (Peer peer) => RecentPeerCard(
peer: peer, peer: peer,
),
initPeers: [],
); );
super._initPeers = [];
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -210,13 +216,17 @@ class RecentPeerWidget extends BasePeerWidget {
} }
class FavoritePeerWidget extends BasePeerWidget { class FavoritePeerWidget extends BasePeerWidget {
FavoritePeerWidget({Key? key}) : super(key: key) { FavoritePeerWidget({Key? key})
super._name = "favorite peer"; : super(
super._loadEvent = "load_fav_peers"; key: key,
super._offstageFunc = (Peer _peer) => false; name: 'favorite peer',
super._peerCardWidgetFunc = (Peer peer) => FavoritePeerCard(peer: peer); loadEvent: 'load_fav_peers',
super._initPeers = []; offstageFunc: (Peer peer) => false,
} peerCardWidgetFunc: (Peer peer) => FavoritePeerCard(
peer: peer,
),
initPeers: [],
);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -227,13 +237,17 @@ class FavoritePeerWidget extends BasePeerWidget {
} }
class DiscoveredPeerWidget extends BasePeerWidget { class DiscoveredPeerWidget extends BasePeerWidget {
DiscoveredPeerWidget({Key? key}) : super(key: key) { DiscoveredPeerWidget({Key? key})
super._name = "discovered peer"; : super(
super._loadEvent = "load_lan_peers"; key: key,
super._offstageFunc = (Peer _peer) => false; name: 'discovered peer',
super._peerCardWidgetFunc = (Peer peer) => DiscoveredPeerCard(peer: peer); loadEvent: 'load_lan_peers',
super._initPeers = []; offstageFunc: (Peer peer) => false,
} peerCardWidgetFunc: (Peer peer) => DiscoveredPeerCard(
peer: peer,
),
initPeers: [],
);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -244,21 +258,26 @@ class DiscoveredPeerWidget extends BasePeerWidget {
} }
class AddressBookPeerWidget extends BasePeerWidget { class AddressBookPeerWidget extends BasePeerWidget {
AddressBookPeerWidget({Key? key}) : super(key: key) { AddressBookPeerWidget({Key? key})
super._name = "address book peer"; : super(
super._offstageFunc = key: key,
(Peer peer) => !_hitTag(gFFI.abModel.selectedTags, peer.tags); name: 'address book peer',
super._peerCardWidgetFunc = (Peer peer) => AddressBookPeerCard(peer: peer); loadEvent: 'load_address_book_peers',
super._initPeers = _loadPeers(); offstageFunc: (Peer peer) =>
} !_hitTag(gFFI.abModel.selectedTags, peer.tags),
peerCardWidgetFunc: (Peer peer) => DiscoveredPeerCard(
peer: peer,
),
initPeers: _loadPeers(),
);
List<Peer> _loadPeers() { static List<Peer> _loadPeers() {
return gFFI.abModel.peers.map((e) { return gFFI.abModel.peers.map((e) {
return Peer.fromJson(e['id'], e); return Peer.fromJson(e['id'], e);
}).toList(); }).toList();
} }
bool _hitTag(List<dynamic> selectedTags, List<dynamic> idents) { static bool _hitTag(List<dynamic> selectedTags, List<dynamic> idents) {
if (selectedTags.isEmpty) { if (selectedTags.isEmpty) {
return true; return true;
} }

30
flutter/lib/desktop/widgets/peercard_widget.dart
View File

@ -348,11 +348,11 @@ abstract class BasePeerCard extends StatelessWidget {
assert(!(isFileTransfer && isTcpTunneling && isRDP), assert(!(isFileTransfer && isTcpTunneling && isRDP),
"more than one connect type"); "more than one connect type");
if (isFileTransfer) { if (isFileTransfer) {
await rustDeskWinManager.new_file_transfer(id); await rustDeskWinManager.newFileTransfer(id);
} else if (isTcpTunneling || isRDP) { } else if (isTcpTunneling || isRDP) {
await rustDeskWinManager.new_port_forward(id, isRDP); await rustDeskWinManager.newPortForward(id, isRDP);
} else { } else {
await rustDeskWinManager.new_remote_desktop(id); await rustDeskWinManager.newRemoteDesktop(id);
} }
FocusScopeNode currentFocus = FocusScope.of(context); FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus) { if (!currentFocus.hasPrimaryFocus) {
@ -468,7 +468,8 @@ abstract class BasePeerCard extends StatelessWidget {
} }
@protected @protected
MenuEntryBase<String> _removeAction(String id) { MenuEntryBase<String> _removeAction(
String id, Future<void> Function() reloadFunc) {
return MenuEntryButton<String>( return MenuEntryButton<String>(
childBuilder: (TextStyle? style) => Text( childBuilder: (TextStyle? style) => Text(
translate('Remove'), translate('Remove'),
@ -478,7 +479,8 @@ abstract class BasePeerCard extends StatelessWidget {
() async { () async {
await bind.mainRemovePeer(id: id); await bind.mainRemovePeer(id: id);
removePreference(id); removePreference(id);
Get.forceAppUpdate(); // TODO use inner model / state await reloadFunc();
// Get.forceAppUpdate(); // TODO use inner model / state
}(); }();
}, },
dismissOnClicked: true, dismissOnClicked: true,
@ -614,7 +616,9 @@ class RecentPeerCard extends BasePeerCard {
} }
menuItems.add(await _forceAlwaysRelayAction(peer.id)); menuItems.add(await _forceAlwaysRelayAction(peer.id));
menuItems.add(_renameAction(peer.id, false)); menuItems.add(_renameAction(peer.id, false));
menuItems.add(_removeAction(peer.id)); menuItems.add(_removeAction(peer.id, () async {
await bind.mainLoadRecentPeers();
}));
menuItems.add(_unrememberPasswordAction(peer.id)); menuItems.add(_unrememberPasswordAction(peer.id));
menuItems.add(_addFavAction(peer.id)); menuItems.add(_addFavAction(peer.id));
return menuItems; return menuItems;
@ -638,7 +642,9 @@ class FavoritePeerCard extends BasePeerCard {
} }
menuItems.add(await _forceAlwaysRelayAction(peer.id)); menuItems.add(await _forceAlwaysRelayAction(peer.id));
menuItems.add(_renameAction(peer.id, false)); menuItems.add(_renameAction(peer.id, false));
menuItems.add(_removeAction(peer.id)); menuItems.add(_removeAction(peer.id, () async {
await bind.mainLoadFavPeers();
}));
menuItems.add(_unrememberPasswordAction(peer.id)); menuItems.add(_unrememberPasswordAction(peer.id));
menuItems.add(_rmFavAction(peer.id)); menuItems.add(_rmFavAction(peer.id));
return menuItems; return menuItems;
@ -662,9 +668,10 @@ class DiscoveredPeerCard extends BasePeerCard {
} }
menuItems.add(await _forceAlwaysRelayAction(peer.id)); menuItems.add(await _forceAlwaysRelayAction(peer.id));
menuItems.add(_renameAction(peer.id, false)); menuItems.add(_renameAction(peer.id, false));
menuItems.add(_removeAction(peer.id)); menuItems.add(_removeAction(peer.id, () async {
await bind.mainLoadLanPeers();
}));
menuItems.add(_unrememberPasswordAction(peer.id)); menuItems.add(_unrememberPasswordAction(peer.id));
menuItems.add(_addFavAction(peer.id));
return menuItems; return menuItems;
} }
} }
@ -686,7 +693,7 @@ class AddressBookPeerCard extends BasePeerCard {
} }
menuItems.add(await _forceAlwaysRelayAction(peer.id)); menuItems.add(await _forceAlwaysRelayAction(peer.id));
menuItems.add(_renameAction(peer.id, false)); menuItems.add(_renameAction(peer.id, false));
menuItems.add(_removeAction(peer.id)); menuItems.add(_removeAction(peer.id, () async {}));
menuItems.add(_unrememberPasswordAction(peer.id)); menuItems.add(_unrememberPasswordAction(peer.id));
menuItems.add(_addFavAction(peer.id)); menuItems.add(_addFavAction(peer.id));
menuItems.add(_editTagAction(peer.id)); menuItems.add(_editTagAction(peer.id));
@ -695,7 +702,8 @@ class AddressBookPeerCard extends BasePeerCard {
@protected @protected
@override @override
MenuEntryBase<String> _removeAction(String id) { MenuEntryBase<String> _removeAction(
String id, Future<void> Function() reloadFunc) {
return MenuEntryButton<String>( return MenuEntryButton<String>(
childBuilder: (TextStyle? style) => Text( childBuilder: (TextStyle? style) => Text(
translate('Remove'), translate('Remove'),

23
flutter/lib/models/model.dart
View File

@ -301,6 +301,9 @@ class FfiModel with ChangeNotifier {
/// Handle the peer info event based on [evt]. /// Handle the peer info event based on [evt].
void handlePeerInfo(Map<String, dynamic> evt, String peerId) async { void handlePeerInfo(Map<String, dynamic> evt, String peerId) async {
// recent peer updated by handle_peer_info(ui_session_interface.rs) --> handle_peer_info(client.rs) --> save_config(client.rs)
bind.mainLoadRecentPeers();
parent.target?.dialogManager.dismissAll(); parent.target?.dialogManager.dismissAll();
_pi.version = evt['version']; _pi.version = evt['version'];
_pi.username = evt['username']; _pi.username = evt['username'];
@ -556,18 +559,18 @@ class CanvasModel with ChangeNotifier {
var dxOffset = 0; var dxOffset = 0;
var dyOffset = 0; var dyOffset = 0;
if (dw > size.width) { if (dw > size.width) {
final xxxx = x - dw * (x / size.width) - _x; final X_debugNanOrInfinite = x - dw * (x / size.width) - _x;
if (xxxx.isInfinite || xxxx.isNaN) { if (X_debugNanOrInfinite.isInfinite || X_debugNanOrInfinite.isNaN) {
debugPrint( debugPrint(
'REMOVE ME ============================ xxxx $x,$dw,$_scale,${size.width},$_x'); 'REMOVE ME ============================ X_debugNanOrInfinite $x,$dw,$_scale,${size.width},$_x');
} }
dxOffset = (x - dw * (x / size.width) - _x).toInt(); dxOffset = (x - dw * (x / size.width) - _x).toInt();
} }
if (dh > size.height) { if (dh > size.height) {
final yyyy = y - dh * (y / size.height) - _y; final Y_debugNanOrInfinite = y - dh * (y / size.height) - _y;
if (yyyy.isInfinite || yyyy.isNaN) { if (Y_debugNanOrInfinite.isInfinite || Y_debugNanOrInfinite.isNaN) {
debugPrint( debugPrint(
'REMOVE ME ============================ xxxx $y,$dh,$_scale,${size.height},$_y'); 'REMOVE ME ============================ Y_debugNanOrInfinite $y,$dh,$_scale,${size.height},$_y');
} }
dyOffset = (y - dh * (y / size.height) - _y).toInt(); dyOffset = (y - dh * (y / size.height) - _y).toInt();
} }
@ -1249,20 +1252,20 @@ class PeerInfo {
Future<void> savePreference(String id, double xCursor, double yCursor, Future<void> savePreference(String id, double xCursor, double yCursor,
double xCanvas, double yCanvas, double scale, int currentDisplay) async { double xCanvas, double yCanvas, double scale, int currentDisplay) async {
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
final p = Map<String, dynamic>(); final p = <String, dynamic>{};
p['xCursor'] = xCursor; p['xCursor'] = xCursor;
p['yCursor'] = yCursor; p['yCursor'] = yCursor;
p['xCanvas'] = xCanvas; p['xCanvas'] = xCanvas;
p['yCanvas'] = yCanvas; p['yCanvas'] = yCanvas;
p['scale'] = scale; p['scale'] = scale;
p['currentDisplay'] = currentDisplay; p['currentDisplay'] = currentDisplay;
prefs.setString('peer' + id, json.encode(p)); prefs.setString('peer$id', json.encode(p));
} }
Future<Map<String, dynamic>?> getPreference(String id) async { Future<Map<String, dynamic>?> getPreference(String id) async {
if (!isWebDesktop) return null; if (!isWebDesktop) return null;
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
var p = prefs.getString('peer' + id); var p = prefs.getString('peer$id');
if (p == null) return null; if (p == null) return null;
Map<String, dynamic> m = json.decode(p); Map<String, dynamic> m = json.decode(p);
return m; return m;
@ -1270,7 +1273,7 @@ Future<Map<String, dynamic>?> getPreference(String id) async {
void removePreference(String id) async { void removePreference(String id) async {
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.remove('peer' + id); prefs.remove('peer$id');
} }
void initializeCursorAndCanvas(FFI ffi) async { void initializeCursorAndCanvas(FFI ffi) async {

58
flutter/lib/models/peer_model.dart
View File

@ -10,9 +10,8 @@ class Peer {
final List<dynamic> tags; final List<dynamic> tags;
bool online = false; bool online = false;
Peer.fromJson(String id, Map<String, dynamic> json) Peer.fromJson(this.id, Map<String, dynamic> json)
: id = id, : username = json['username'] ?? '',
username = json['username'] ?? '',
hostname = json['hostname'] ?? '', hostname = json['hostname'] ?? '',
platform = json['platform'] ?? '', platform = json['platform'] ?? '',
tags = json['tags'] ?? []; tags = json['tags'] ?? [];
@ -35,57 +34,52 @@ class Peer {
} }
class Peers extends ChangeNotifier { class Peers extends ChangeNotifier {
late String _name; final String name;
late List<Peer> _peers; final String loadEvent;
late final _loadEvent; List<Peer> peers;
static const _cbQueryOnlines = 'callback_query_onlines'; static const _cbQueryOnlines = 'callback_query_onlines';
Peers(String name, String loadEvent, List<Peer> _initPeers) { Peers({required this.name, required this.peers, required this.loadEvent}) {
_name = name; platformFFI.registerEventHandler(_cbQueryOnlines, name, (evt) {
_loadEvent = loadEvent;
_peers = _initPeers;
platformFFI.registerEventHandler(_cbQueryOnlines, _name, (evt) {
_updateOnlineState(evt); _updateOnlineState(evt);
}); });
platformFFI.registerEventHandler(_loadEvent, _name, (evt) { platformFFI.registerEventHandler(loadEvent, name, (evt) {
_updatePeers(evt); _updatePeers(evt);
}); });
} }
List<Peer> get peers => _peers;
@override @override
void dispose() { void dispose() {
platformFFI.unregisterEventHandler(_cbQueryOnlines, _name); platformFFI.unregisterEventHandler(_cbQueryOnlines, name);
platformFFI.unregisterEventHandler(_loadEvent, _name); platformFFI.unregisterEventHandler(loadEvent, name);
super.dispose(); super.dispose();
} }
Peer getByIndex(int index) { Peer getByIndex(int index) {
if (index < _peers.length) { if (index < peers.length) {
return _peers[index]; return peers[index];
} else { } else {
return Peer.loading(); return Peer.loading();
} }
} }
int getPeersCount() { int getPeersCount() {
return _peers.length; return peers.length;
} }
void _updateOnlineState(Map<String, dynamic> evt) { void _updateOnlineState(Map<String, dynamic> evt) {
evt['onlines'].split(',').forEach((online) { evt['onlines'].split(',').forEach((online) {
for (var i = 0; i < _peers.length; i++) { for (var i = 0; i < peers.length; i++) {
if (_peers[i].id == online) { if (peers[i].id == online) {
_peers[i].online = true; peers[i].online = true;
} }
} }
}); });
evt['offlines'].split(',').forEach((offline) { evt['offlines'].split(',').forEach((offline) {
for (var i = 0; i < _peers.length; i++) { for (var i = 0; i < peers.length; i++) {
if (_peers[i].id == offline) { if (peers[i].id == offline) {
_peers[i].online = false; peers[i].online = false;
} }
} }
}); });
@ -95,19 +89,19 @@ class Peers extends ChangeNotifier {
void _updatePeers(Map<String, dynamic> evt) { void _updatePeers(Map<String, dynamic> evt) {
final onlineStates = _getOnlineStates(); final onlineStates = _getOnlineStates();
_peers = _decodePeers(evt['peers']); peers = _decodePeers(evt['peers']);
_peers.forEach((peer) { for (var peer in peers) {
final state = onlineStates[peer.id]; final state = onlineStates[peer.id];
peer.online = state != null && state != false; peer.online = state != null && state != false;
}); }
notifyListeners(); notifyListeners();
} }
Map<String, bool> _getOnlineStates() { Map<String, bool> _getOnlineStates() {
var onlineStates = new Map<String, bool>(); var onlineStates = <String, bool>{};
_peers.forEach((peer) { for (var peer in peers) {
onlineStates[peer.id] = peer.online; onlineStates[peer.id] = peer.online;
}); }
return onlineStates; return onlineStates;
} }
@ -121,7 +115,7 @@ class Peers extends ChangeNotifier {
Peer.fromJson(s[0] as String, s[1] as Map<String, dynamic>)) Peer.fromJson(s[0] as String, s[1] as Map<String, dynamic>))
.toList(); .toList();
} catch (e) { } catch (e) {
print('peers(): $e'); debugPrint('peers(): $e');
} }
return []; return [];
} }

18
flutter/lib/utils/multi_window_manager.dart
View File

@ -1,5 +1,4 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:ui';
import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -37,9 +36,9 @@ class RustDeskMultiWindowManager {
int? _fileTransferWindowId; int? _fileTransferWindowId;
int? _portForwardWindowId; int? _portForwardWindowId;
Future<dynamic> new_remote_desktop(String remote_id) async { Future<dynamic> newRemoteDesktop(String remoteId) async {
final msg = final msg =
jsonEncode({"type": WindowType.RemoteDesktop.index, "id": remote_id}); jsonEncode({"type": WindowType.RemoteDesktop.index, "id": remoteId});
try { try {
final ids = await DesktopMultiWindow.getAllSubWindowIds(); final ids = await DesktopMultiWindow.getAllSubWindowIds();
@ -63,9 +62,9 @@ class RustDeskMultiWindowManager {
} }
} }
Future<dynamic> new_file_transfer(String remote_id) async { Future<dynamic> newFileTransfer(String remoteId) async {
final msg = final msg =
jsonEncode({"type": WindowType.FileTransfer.index, "id": remote_id}); jsonEncode({"type": WindowType.FileTransfer.index, "id": remoteId});
try { try {
final ids = await DesktopMultiWindow.getAllSubWindowIds(); final ids = await DesktopMultiWindow.getAllSubWindowIds();
@ -88,12 +87,9 @@ class RustDeskMultiWindowManager {
} }
} }
Future<dynamic> new_port_forward(String remote_id, bool isRDP) async { Future<dynamic> newPortForward(String remoteId, bool isRDP) async {
final msg = jsonEncode({ final msg = jsonEncode(
"type": WindowType.PortForward.index, {"type": WindowType.PortForward.index, "id": remoteId, "isRDP": isRDP});
"id": remote_id,
"isRDP": isRDP
});
try { try {
final ids = await DesktopMultiWindow.getAllSubWindowIds(); final ids = await DesktopMultiWindow.getAllSubWindowIds();

4
src/client.rs
View File

@ -1278,11 +1278,11 @@ impl LoginConfigHandler {
/// ///
/// * `username` - The name of the peer. /// * `username` - The name of the peer.
/// * `pi` - The peer info. /// * `pi` - The peer info.
pub fn handle_peer_info(&mut self, pi: PeerInfo) { pub fn handle_peer_info(&mut self, pi: &PeerInfo) {
if !pi.version.is_empty() { if !pi.version.is_empty() {
self.version = hbb_common::get_version_number(&pi.version); self.version = hbb_common::get_version_number(&pi.version);
} }
self.features = pi.features.into_option(); self.features = pi.features.clone().into_option();
let serde = PeerInfoSerde { let serde = PeerInfoSerde {
username: pi.username.clone(), username: pi.username.clone(),
hostname: pi.hostname.clone(), hostname: pi.hostname.clone(),

4
src/flutter_ffi.rs
View File

@ -205,8 +205,8 @@ pub fn session_get_custom_image_quality(id: String) -> Option<Vec<i32>> {
} }
pub fn session_set_custom_image_quality(id: String, value: i32) { pub fn session_set_custom_image_quality(id: String, value: i32) {
if let Some(session) = SESSIONS.read().unwrap().get(&id) { if let Some(session) = SESSIONS.write().unwrap().get_mut(&id) {
session.set_custom_image_quality(value); session.save_custom_image_quality(value);
} }
} }

11
src/ui_session_interface.rs
View File

@ -47,6 +47,11 @@ impl<T: InvokeUi> Session<T> {
self.lc.read().unwrap().image_quality.clone() self.lc.read().unwrap().image_quality.clone()
} }
/// Get custom image quality.
pub fn get_custom_image_quality(&self) -> Vec<i32> {
self.lc.read().unwrap().custom_image_quality.clone()
}
pub fn save_view_style(&mut self, value: String) { pub fn save_view_style(&mut self, value: String) {
self.lc.write().unwrap().save_view_style(value); self.lc.write().unwrap().save_view_style(value);
} }
@ -634,7 +639,7 @@ impl<T: InvokeUi> Interface for Session<T> {
} }
} else if !self.is_port_forward() { } else if !self.is_port_forward() {
if pi.displays.is_empty() { if pi.displays.is_empty() {
self.lc.write().unwrap().handle_peer_info(pi); self.lc.write().unwrap().handle_peer_info(&pi);
self.update_privacy_mode(); self.update_privacy_mode();
self.msgbox("error", "Remote Error", "No Display"); self.msgbox("error", "Remote Error", "No Display");
return; return;
@ -647,9 +652,9 @@ impl<T: InvokeUi> Interface for Session<T> {
self.set_display(current.x, current.y, current.width, current.height); self.set_display(current.x, current.y, current.width, current.height);
} }
self.update_privacy_mode(); self.update_privacy_mode();
// Save recent peers, then push event to flutter. So flutter can refresh peer page.
self.lc.write().unwrap().handle_peer_info(&pi);
self.set_peer_info(&pi); self.set_peer_info(&pi);
self.lc.write().unwrap().handle_peer_info(pi);
if self.is_file_transfer() { if self.is_file_transfer() {
self.close_success(); self.close_success();
} else if !self.is_port_forward() { } else if !self.is_port_forward() {