leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collapse nested 'if' statements

Browse source
This commit is contained in:
daniel.eades 2023-11-16 17:52:36 +00:00 • committed by Ashley Wulber
parent e6010b147a
commit 03bb6ea3be
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cosmic-applet-network/src/network_manager/mod.rs
View file

@ -92,8 +92,9 @@ async fn start_listening(
.await .await
.unwrap_or_default() .unwrap_or_default()
{ {
if c.id().await.unwrap_or_default() == ssid { if c.id().await.unwrap_or_default() == ssid
if network_manager.deactivate_connection(&c).await.is_ok() { && network_manager.deactivate_connection(&c).await.is_ok()
{
success = true; success = true;
if let Ok(ActiveConnectionState::Deactivated) = c.state().await { if let Ok(ActiveConnectionState::Deactivated) = c.state().await {
break; break;
@ -102,10 +103,8 @@ async fn start_listening(
_ = tokio::time::timeout(Duration::from_secs(5), async move { _ = tokio::time::timeout(Duration::from_secs(5), async move {
loop { loop {
if let Some(next) = changed.next().await { if let Some(next) = changed.next().await {
if let Ok(ActiveConnectionState::Deactivated) = next if let Ok(ActiveConnectionState::Deactivated) =
.get() next.get().await.map(ActiveConnectionState::from)
.await
.map(ActiveConnectionState::from)
{ {
break; break;
} }
@ -117,7 +116,6 @@ async fn start_listening(
break; break;
} }
} }
}
_ = output _ = output
.send(NetworkManagerEvent::RequestResponse { .send(NetworkManagerEvent::RequestResponse {
req: NetworkManagerRequest::Disconnect(ssid.clone()), req: NetworkManagerRequest::Disconnect(ssid.clone()),