daemon: Rename initiate_event_stream to subscribe

Author: kashifsoofi

credentialsd-common/src/client.rs

@@ -15,7 +15,7 @@ pub trait FlowController {
 
     fn get_hybrid_credential(&mut self) -> impl Future<Output = Result<(), ()>> + Send;
     fn get_usb_credential(&mut self) -> impl Future<Output = Result<(), ()>> + Send;
-    fn initiate_event_stream(
+    fn subscribe(
         &mut self,
     ) -> impl Future<
         Output = Result<Pin<Box<dyn Stream<Item = BackgroundEvent> + Send + 'static>>, ()>,

credentialsd-ui/src/client.rs

@@ -53,7 +53,7 @@ impl FlowController for DbusCredentialClient {
             .map_err(|_| ())
     }
 
-    async fn initiate_event_stream(
+    async fn subscribe(
         &mut self,
     ) -> std::result::Result<
         std::pin::Pin<
@@ -80,7 +80,7 @@ impl FlowController for DbusCredentialClient {
             .boxed();
         self.proxy()
             .await?
-            .initiate_event_stream()
+            .subscribe()
             .await
             .map_err(|err| tracing::error!("Failed to initialize event stream: {err}"))
             .map(|_| stream)

credentialsd-ui/src/dbus.rs

@@ -9,7 +9,7 @@ use zbus::{fdo, interface, proxy};
     default_service = "xyz.iinuwa.credentialsd.FlowControl"
 )]
 pub trait FlowControlService {
-    async fn initiate_event_stream(&self) -> fdo::Result<()>;
+    async fn subscribe(&self) -> fdo::Result<()>;
 
     async fn get_available_public_key_devices(&self) -> fdo::Result<Vec<Device>>;
 

credentialsd-ui/src/gui/view_model/mod.rs

@@ -133,7 +133,7 @@ impl<F: FlowController + Send> ViewModel<F> {
         let view_events = self.rx_event.clone().map(Event::View);
         let bg_events = {
             let mut cred_service = self.flow_controller.lock().await;
-            cred_service.initiate_event_stream().await.unwrap()
+            cred_service.subscribe().await.unwrap()
         };
         let mut all_events = view_events.merge(bg_events.map(Event::Background));
         while let Some(event) = all_events.next().await {

credentialsd/src/dbus/flow_control.rs

@@ -98,7 +98,7 @@ where
     U: UsbHandler + Debug + Send + Sync + 'static,
     UC: UiController + Debug + Send + Sync + 'static,
 {
-    async fn initiate_event_stream(
+    async fn subscribe(
         &self,
         #[zbus(signal_emitter)] emitter: SignalEmitter<'_>,
     ) -> fdo::Result<()> {
@@ -434,7 +434,7 @@ pub mod test {
             }
         }
 
-        async fn initiate_event_stream(
+        async fn subscribe(
             &mut self,
         ) -> Result<Pin<Box<dyn Stream<Item = BackgroundEvent> + Send + 'static>>, ()> {
             if let Ok(DummyFlowResponse::InitStream(Ok(stream))) =
@@ -542,7 +542,7 @@ pub mod test {
                         DummyFlowResponse::GetUsbCredential
                     }
                     DummyFlowRequest::InitStream => {
-                        let rsp = self.initiate_event_stream().await;
+                        let rsp = self.subscribe().await;
                         DummyFlowResponse::InitStream(rsp)
                     }
                 };
@@ -644,7 +644,7 @@ pub mod test {
             Ok(())
         }
 
-        async fn initiate_event_stream(
+        async fn subscribe(
             &mut self,
         ) -> Result<Pin<Box<dyn Stream<Item = BackgroundEvent> + Send + 'static>>, ()> {
             let (tx, mut rx) = mpsc::channel(32);

credentialsd/src/dbus/ui_control.rs

@@ -202,7 +202,7 @@ pub mod test {
                 .await
                 .as_mut()
                 .unwrap()
-                .initiate_event_stream()
+                .subscribe()
                 .await
                 .unwrap();
             self.stream_initialized.store(true, Ordering::Release);