Make questions config optional

Author: joseivanlopez

rust/agama-manager/src/service.rs

@@ -162,7 +162,7 @@ impl MessageHandler<message::GetExtendedConfig> for Service {
         let storage = self.storage.call(storage::message::GetConfig).await?;
         Ok(Config {
             l10n: Some(l10n),
-            questions: Some(questions),
+            questions,
             storage,
         })
     }

rust/agama-utils/src/question/message.rs

@@ -27,7 +27,7 @@ use crate::{
 pub struct GetConfig;
 
 impl Message for GetConfig {
-    type Reply = Config;
+    type Reply = Option<Config>;
 }
 
 /// Sets questions configuration (policy, pre-defined answers, etc.).

rust/agama-utils/src/question/service.rs

@@ -44,7 +44,7 @@ pub enum Error {
 }
 
 pub struct Service {
-    config: Config,
+    config: Option<Config>,
     questions: Vec<Question>,
     current_id: u32,
     events: event::Sender,
@@ -61,25 +61,28 @@ impl Service {
     }
 
     pub fn find_answer(&self, spec: &QuestionSpec) -> Option<Answer> {
-        let answer = self
-            .config
-            .answers
-            .iter()
-            .find(|a| a.answers_to(&spec))
-            .map(|r| r.answer.clone());
+        let answer = self.config.as_ref().and_then(|config| {
+            config
+                .answers
+                .iter()
+                .find(|a| a.answers_to(&spec))
+                .map(|r| r.answer.clone())
+        });
 
         if answer.is_some() {
             return answer;
         }
 
-        if let Some(Policy::Auto) = self.config.policy {
-            spec.default_action.clone().map(|action| Answer {
-                action,
-                value: None,
-            })
-        } else {
-            None
-        }
+        self.config.as_ref().and_then(|config| {
+            if let Some(Policy::Auto) = config.policy {
+                spec.default_action.clone().map(|action| Answer {
+                    action,
+                    value: None,
+                })
+            } else {
+                None
+            }
+        })
     }
 }
 
@@ -89,19 +92,15 @@ impl Actor for Service {
 
 #[async_trait]
 impl MessageHandler<message::GetConfig> for Service {
-    async fn handle(&mut self, _message: message::GetConfig) -> Result<Config, Error> {
+    async fn handle(&mut self, _message: message::GetConfig) -> Result<Option<Config>, Error> {
         Ok(self.config.clone())
     }
 }
 
 #[async_trait]
 impl MessageHandler<message::SetConfig> for Service {
     async fn handle(&mut self, message: message::SetConfig) -> Result<(), Error> {
-        if let Some(config) = message.config {
-            self.config = config;
-        } else {
-            self.config = Config::default();
-        }
+        self.config = message.config;
         Ok(())
     }
 }