From ee8510cec7fdedf9ae2b7370fc4db070d87c5a88 Mon Sep 17 00:00:00 2001 From: 21pages Date: Sun, 20 Aug 2023 11:24:34 +0800 Subject: [PATCH] peer_to_map function serde password Signed-off-by: 21pages --- src/flutter_ffi.rs | 2 +- src/ui_interface.rs | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index f076b4b23..50f1e33dc 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -895,7 +895,7 @@ pub fn main_load_recent_peers_for_ab(filter: String) -> String { if !config::APP_DIR.read().unwrap().is_empty() { let peers: Vec> = PeerConfig::peers(id_filters) .drain(..) - .map(|(id, _, p)| peer_to_map_ab(id, p)) + .map(|(id, _, p)| peer_to_map(id, p)) .collect(); return serde_json::ser::to_string(&peers).unwrap_or("".to_owned()); } diff --git a/src/ui_interface.rs b/src/ui_interface.rs index 1589a4e2b..7e1b3a9bb 100644 --- a/src/ui_interface.rs +++ b/src/ui_interface.rs @@ -625,6 +625,7 @@ pub fn discover() { #[cfg(feature = "flutter")] pub fn peer_to_map(id: String, p: PeerConfig) -> HashMap<&'static str, String> { + use hbb_common::sodiumoxide::base64; HashMap::<&str, String>::from_iter([ ("id", id), ("username", p.info.username.clone()), @@ -634,20 +635,13 @@ pub fn peer_to_map(id: String, p: PeerConfig) -> HashMap<&'static str, String> { "alias", p.options.get("alias").unwrap_or(&"".to_owned()).to_owned(), ), + ( + "hash", + base64::encode(p.password, base64::Variant::Original), + ), ]) } -#[cfg(feature = "flutter")] -pub fn peer_to_map_ab(id: String, p: PeerConfig) -> HashMap<&'static str, String> { - use hbb_common::sodiumoxide::base64; - let mut m = peer_to_map(id, p.clone()); - m.insert( - "hash", - base64::encode(p.password, base64::Variant::Original), - ); - m -} - #[cfg(feature = "flutter")] pub fn peer_exists(id: &str) -> bool { PeerConfig::exists(id)