From dc2b25f1523cfda15854bc5b56abaec20eacf02d Mon Sep 17 00:00:00 2001 From: Pierre Dommerc Date: Tue, 31 Jan 2023 12:08:57 +0100 Subject: [PATCH] fix(nc-android): panic on socks5 client connect (#2929) --- clients/socks5/src/client/mod.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/clients/socks5/src/client/mod.rs b/clients/socks5/src/client/mod.rs index ca6348cc45..a6c88ed31a 100644 --- a/clients/socks5/src/client/mod.rs +++ b/clients/socks5/src/client/mod.rs @@ -209,21 +209,23 @@ impl NymClient { pub async fn start(self) -> Result { #[cfg(not(feature = "mobile"))] - let fs_reply_surb_backend = non_wasm_helpers::setup_fs_reply_surb_backend( - Some(self.config.get_base().get_reply_surb_database_path()), - self.config.get_debug_settings(), - ) - .await?; - - #[cfg(feature = "mobile")] - let fs_reply_surb_backend = - setup_empty_reply_surb_backend(self.config.get_debug_settings()); - let base_builder = BaseClientBuilder::new_from_base_config( self.config.get_base(), self.key_manager, Some(Self::create_bandwidth_controller(&self.config).await), - fs_reply_surb_backend, + non_wasm_helpers::setup_fs_reply_surb_backend( + Some(self.config.get_base().get_reply_surb_database_path()), + self.config.get_debug_settings(), + ) + .await?, + ); + + #[cfg(feature = "mobile")] + let base_builder = BaseClientBuilder::<_, QueryNyxdClient>::new_from_base_config( + self.config.get_base(), + self.key_manager, + None, + setup_empty_reply_surb_backend(self.config.get_debug_settings()), ); let self_address = base_builder.as_mix_recipient();