Avoid cloning Config and mutable state

Author: joshuamegnauth54

src/background.rs

@@ -2,7 +2,7 @@
 
 use std::collections::{hash_map::Entry, HashMap};
 
-use cosmic::{iced::window, iced_runtime::command::Action, widget};
+use cosmic::{iced::window, widget};
 use futures::{FutureExt, TryFutureExt};
 use tokio::sync::mpsc::Sender;
 use zbus::{fdo, object_server::SignalContext, zvariant};
@@ -21,17 +21,12 @@ const POP_SHELL_PATH: &str = "/com.System76.PopShell";
 /// https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.impl.portal.Background.html
 pub struct Background {
     tx: Sender<subscription::Event>,
-    config: config::background::Background,
 }
 
 impl Background {
-    pub fn new(tx: Sender<subscription::Event>) -> Self {
-        // FIXME: Will need to change this to handle external updates (e.g. from cosmic-settings)
-        let config = config::Config::load().0.background;
-        Self { tx, config }
+    pub const fn new(tx: Sender<subscription::Event>) -> Self {
+        Self { tx }
     }
-
-    // fn dialog(name: &str) -> widget::Dialog<'_, PermissionResponse> {}
 }
 
 #[zbus::interface(name = "org.freedesktop.impl.portal.Background")]
@@ -48,7 +43,7 @@ impl Background {
 
     /// Notifies the user that an app is running in the background
     async fn notify_background(
-        &mut self,
+        &self,
         // #[zbus(connection)] connection: &zbus::Connection,
         #[zbus(signal_context)] context: SignalContext<'_>,
         handle: zvariant::ObjectPath<'_>,
@@ -57,6 +52,18 @@ impl Background {
     ) -> PortalResponse<NotifyBackgroundResult> {
         log::debug!("[background] Request handle: {handle:?}");
 
+        // Request only what's needed to avoid cloning and receiving the entire config
+        // This is also cleaner than storing the config because it's difficult to keep it
+        // updated without synch primitives
+        let (tx, mut rx) = tokio::sync::mpsc::channel(1);
+        let config = self
+            .tx
+            .send(subscription::Event::BackgroundReq(tx, app_id.clone()))
+            .inspect_err(|e| log::error!("[background] Failed receiving background config from main app {e:?}"))
+            .and_then(|_| rx.recv())
+            .unwrap_or_default()
+            .await;
+
         match self.config.apps.entry(app_id) {
             // Skip dialog based on default response set in configs
             _ if self.config.default_perm == PermissionDialog::Allow => {