Change GetEncryptionMethod to a property

Author: imobachgs

rust/agama-storage-client/src/proxies/storage1.rs

@@ -32,9 +32,6 @@ pub trait Storage1 {
     /// Finish method
     fn finish(&self) -> zbus::Result<()>;
 
-    /// GetEncryptionMethods method
-    fn get_encryption_methods(&self) -> zbus::Result<String>;
-
     /// GetConfigFromModel method
     fn get_config_from_model(&self, model: &str) -> zbus::Result<String>;
 
@@ -72,6 +69,10 @@ pub trait Storage1 {
     #[zbus(property)]
     fn config_model(&self) -> zbus::Result<String>;
 
+    /// EncryptionMethods property
+    #[zbus(property)]
+    fn encryption_methods(&self) -> zbus::Result<String>;
+
     /// Issues property
     #[zbus(property)]
     fn issues(&self) -> zbus::Result<String>;

rust/agama-storage-client/src/service.rs

@@ -174,7 +174,7 @@ impl MessageHandler<message::GetEncryptionMethods> for Service {
         &mut self,
         _message: message::GetEncryptionMethods,
     ) -> Result<Vec<String>, Error> {
-        let raw_json = self.storage_proxy.get_encryption_methods().await?;
+        let raw_json = self.storage_proxy.encryption_methods().await?;
         Ok(try_from_string(&raw_json)?)
     }
 }

service/lib/agama/dbus/storage/manager.rb

@@ -59,6 +59,7 @@ def initialize(manager, task_runner, logger: nil)
           @serialized_proposal = serialize_proposal
           @serialized_issues = serialize_issues
           @serialized_bootloader_config = serialize_bootloader_config
+          @serialized_encryption_methods = serialize_encryption_methods
           register_progress_callbacks
         end
 
@@ -68,6 +69,8 @@ def initialize(manager, task_runner, logger: nil)
           dbus_reader_attr_accessor :serialized_config_model, "s", dbus_name: "ConfigModel"
           dbus_reader_attr_accessor :serialized_proposal, "s", dbus_name: "Proposal"
           dbus_reader_attr_accessor :serialized_issues, "s", dbus_name: "Issues"
+          dbus_reader_attr_accessor :serialized_encryption_methods, "s",
+            dbus_name: "EncryptionMethods"
           dbus_method(:Activate) { activate }
           dbus_method(:Probe) { probe }
           dbus_method(:Install) { install }
@@ -83,7 +86,6 @@ def initialize(manager, task_runner, logger: nil)
           dbus_method(
             :SolveConfigModel, "in serialized_model:s, out result:s"
           ) { |m| solve_config_model(m) }
-          dbus_method(:GetEncryptionMethods, "out methods:s") { encryption_methods }
           dbus_signal(:SystemChanged, "serialized_system:s")
           dbus_signal(:ProposalChanged, "serialized_proposal:s")
           dbus_signal(:ProgressChanged, "serialized_progress:s")
@@ -183,10 +185,10 @@ def solve_config_model(serialized_model)
           JSON.pretty_generate(solved_model_json)
         end
 
-        # Gets the available encryption methods for the current system and product.
+        # Generates the serialized JSON of the available encryption methods.
         #
         # @return [String] Serialized list of encryption method IDs.
-        def encryption_methods
+        def serialize_encryption_methods
           methods = Agama::Storage::EncryptionSettings
             .available_methods
             .map { |m| Agama::Storage::EncryptionSettings.method_id(m) }