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

refactor(network): use channel subscriptions

Browse source
This commit is contained in:
Ashley Wulber 2023-07-10 18:17:32 -04:00 • committed by Ashley Wulber
parent fad3b097d9
commit 4b9f46b388
5 changed files with 154 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cosmic-applet-network/src/app.rs
View file

@ -725,8 +725,7 @@ impl Application for CosmicNetworkApplet {
}
fn subscription(&self) -> Subscription<Message> {
let network_sub =
network_manager_subscription(0).map(|e| Message::NetworkManagerEvent(e.1));
let network_sub = network_manager_subscription(0).map(|e| Message::NetworkManagerEvent(e));
let timeline = self
.timeline
.as_subscription()
@ -737,11 +736,9 @@ impl Application for CosmicNetworkApplet {
self.applet_helper.theme_subscription(0).map(Message::Theme),
timeline,
network_sub,
active_conns_subscription(0, conn.clone())
.map(|e| Message::NetworkManagerEvent(e.1)),
devices_subscription(0, conn.clone()).map(|e| Message::NetworkManagerEvent(e.1)),
wireless_enabled_subscription(0, conn.clone())
.map(|e| Message::NetworkManagerEvent(e.1)),
active_conns_subscription(0, conn.clone()).map(Message::NetworkManagerEvent),
devices_subscription(0, conn.clone()).map(Message::NetworkManagerEvent),
wireless_enabled_subscription(0, conn.clone()).map(Message::NetworkManagerEvent),
])
} else {
Subscription::batch(vec![timeline, network_sub])