diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index 53e3f1ff8..aa46e4faf 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -451,7 +451,7 @@ pub fn main_get_peer(id: String) -> String { } pub fn main_get_lan_peers() -> String { - get_lan_peers() + serde_json::to_string(&get_lan_peers()).unwrap_or_default() } pub fn main_get_connect_status() -> String { @@ -592,7 +592,7 @@ pub fn main_load_lan_peers() { { let data = HashMap::from([ ("name", "load_lan_peers".to_owned()), - ("peers", get_lan_peers()), + ("peers", serde_json::to_string(&get_lan_peers()).unwrap_or_default()), ]); s.add(serde_json::ser::to_string(&data).unwrap_or("".to_owned())); }; diff --git a/src/ui.rs b/src/ui.rs index 1adc7c5ee..78654e9ec 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -500,7 +500,11 @@ impl UI { } fn get_lan_peers(&self) -> String { - get_lan_peers() + let peers = get_lan_peers() + .into_iter() + .map(|(id, peer)| (id, peer.username, peer.hostname, peer.platform)) + .collect::>(); + serde_json::to_string(&peers).unwrap_or_default() } fn get_uuid(&self) -> String { diff --git a/src/ui_interface.rs b/src/ui_interface.rs index f59f96090..a8e3be980 100644 --- a/src/ui_interface.rs +++ b/src/ui_interface.rs @@ -584,8 +584,8 @@ pub fn discover() { }); } -pub fn get_lan_peers() -> String { - let peers: Vec<(String, config::PeerInfoSerde)> = config::LanPeers::load() +pub fn get_lan_peers() -> Vec<(String, config::PeerInfoSerde)> { + config::LanPeers::load() .peers .iter() .map(|peer| { @@ -598,8 +598,7 @@ pub fn get_lan_peers() -> String { }, ) }) - .collect(); - serde_json::to_string(&peers).unwrap_or_default() + .collect() } pub fn get_uuid() -> String {