Merge pull request #134 from kashif-forks/#77-change-state-tense

Author: iinuwa

credentialsd-common/src/model.rs

@@ -192,7 +192,7 @@ pub enum UsbState {
     // This isn't actually sent from the server.
     //UserCancelled,
     /// Multiple credentials have been found and the user has to select which to use
-    SelectCredential {
+    SelectingCredential {
         /// List of user-identities to decide which to use.
         creds: Vec<Credential>,
     },
@@ -227,7 +227,7 @@ pub enum NfcState {
     // This isn't actually sent from the server.
     //UserCancelled,
     /// Multiple credentials have been found and the user has to select which to use
-    SelectCredential {
+    SelectingCredential {
         /// List of user-identities to decide which to use.
         creds: Vec<Credential>,
     },

credentialsd-common/src/server.rs

@@ -373,7 +373,7 @@ impl From<&crate::model::UsbState> for Structure<'_> {
                 (0x06, Some(Value::I32(num)))
             }
             crate::model::UsbState::NeedsUserPresence => (0x07, None),
-            crate::model::UsbState::SelectCredential { creds } => {
+            crate::model::UsbState::SelectingCredential { creds } => {
                 let creds: Vec<Credential> = creds.iter().map(Credential::from).collect();
                 let value = Value::new(creds);
                 (0x08, Some(value))
@@ -430,7 +430,7 @@ impl TryFrom<&Structure<'_>> for crate::model::UsbState {
                         cred
                     })
                     .collect();
-                Ok(Self::SelectCredential { creds: creds? })
+                Ok(Self::SelectingCredential { creds: creds? })
             }
             0x09 => Ok(Self::Completed),
             0x0A => {
@@ -498,7 +498,7 @@ impl From<&crate::model::NfcState> for Structure<'_> {
                 };
                 (0x06, Some(Value::I32(num)))
             }
-            crate::model::NfcState::SelectCredential { creds } => {
+            crate::model::NfcState::SelectingCredential { creds } => {
                 let creds: Vec<Credential> = creds.iter().map(Credential::from).collect();
                 let value = Value::new(creds);
                 (0x08, Some(value))
@@ -553,7 +553,7 @@ impl TryFrom<&Structure<'_>> for crate::model::NfcState {
                         cred
                     })
                     .collect();
-                Ok(Self::SelectCredential { creds: creds? })
+                Ok(Self::SelectingCredential { creds: creds? })
             }
             0x09 => Ok(Self::Completed),
             0x0A => {
@@ -829,14 +829,14 @@ mod test {
                 username: None,
             },
         ];
-        let state = UsbState::SelectCredential { creds };
+        let state = UsbState::SelectingCredential { creds };
         let ctx = zvariant::serialized::Context::new_dbus(zvariant::BE, 0);
         let data = zvariant::to_bytes(ctx, &state).unwrap();
         assert_eq!("(yv)", UsbState::SIGNATURE.to_string());
 
         #[rustfmt::skip]
         let expected = [
-            8, // UsbState::SelectCredential
+            8, // UsbState::SelectingCredential
             6, 97, 97, 123, 115, 118, 125, 0, 0, 0, 0, // Signature aa{sv} + padding
             0, 0, 0, 165, // array(struct) data length
                 0, 0, 0, 83, 0, 0, 0, 0, // element 1(struct) length, + padding(4)
@@ -868,7 +868,7 @@ mod test {
     fn test_deserialize_usb_state() {
         #[rustfmt::skip]
         let input = [
-            8, // UsbState::SelectCredential
+            8, // UsbState::SelectingCredential
             6, 97, 97, 123, 115, 118, 125, 0, 0, 0, 0, // Signature aa{sv} + padding
             0, 0, 0, 165, // array(struct) data length
                 0, 0, 0, 83, 0, 0, 0, 0, // element 1(struct) length, + padding(4)
@@ -897,7 +897,7 @@ mod test {
         let data = Data::new(&input, ctx);
         let state: UsbState = data.deserialize().unwrap().0;
         match state {
-            UsbState::SelectCredential { creds } => {
+            UsbState::SelectingCredential { creds } => {
                 assert_eq!(2, creds.len());
                 assert_eq!("a1b2c3", creds[0].id,);
                 assert_eq!("user 1", creds[0].name,);

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

@@ -268,7 +268,7 @@ impl<F: FlowController + Send> ViewModel<F> {
                                 .unwrap();
                         }
                         UsbState::Idle | UsbState::Waiting => {}
-                        UsbState::SelectCredential { creds } => {
+                        UsbState::SelectingCredential { creds } => {
                             self.tx_update
                                 .send(ViewUpdate::SetCredentials(creds))
                                 .await
@@ -322,7 +322,7 @@ impl<F: FlowController + Send> ViewModel<F> {
                             self.tx_update.send(ViewUpdate::Completed).await.unwrap();
                         }
                         NfcState::Idle | NfcState::Waiting => {}
-                        NfcState::SelectCredential { creds } => {
+                        NfcState::SelectingCredential { creds } => {
                             self.tx_update
                                 .send(ViewUpdate::SetCredentials(creds))
                                 .await

credentialsd/src/credential_service/nfc.rs

@@ -446,7 +446,7 @@ impl From<&NfcState> for credentialsd_common::model::NfcState {
                 }
             }
             NfcState::SelectCredential { creds, .. } => {
-                credentialsd_common::model::NfcState::SelectCredential {
+                credentialsd_common::model::NfcState::SelectingCredential {
                     creds: creds.to_owned(),
                 }
             }

credentialsd/src/credential_service/usb.rs

@@ -463,7 +463,7 @@ pub enum UsbState {
 
     // Multiple credentials have been found and the user has to select which to use
     // List of user-identities to decide which to use.
-    SelectCredential {
+    SelectingCredential {
         creds: Vec<Credential>,
         cred_tx: mpsc::Sender<String>,
     },
@@ -496,7 +496,7 @@ impl From<UsbStateInternal> for UsbState {
             // UsbStateInternal::UserCancelled => UsbState:://UserCancelled,
             UsbStateInternal::SelectingDevice(_) => UsbState::SelectingDevice,
             UsbStateInternal::SelectCredential { response, cred_tx } => {
-                UsbState::SelectCredential {
+                UsbState::SelectingCredential {
                     creds: response
                         .assertions
                         .iter()
@@ -555,8 +555,8 @@ impl From<&UsbState> for credentialsd_common::model::UsbState {
                 }
             }
             UsbState::NeedsUserPresence => credentialsd_common::model::UsbState::NeedsUserPresence,
-            UsbState::SelectCredential { creds, .. } => {
-                credentialsd_common::model::UsbState::SelectCredential {
+            UsbState::SelectingCredential { creds, .. } => {
+                credentialsd_common::model::UsbState::SelectingCredential {
                     creds: creds.to_owned(),
                 }
             }

credentialsd/src/dbus/flow_control.rs

@@ -217,7 +217,7 @@ where
                         let mut usb_pin_tx = usb_pin_tx.lock().await;
                         let _ = usb_pin_tx.insert(pin_tx);
                     }
-                    UsbState::SelectCredential { cred_tx, .. } => {
+                    UsbState::SelectingCredential { cred_tx, .. } => {
                         let mut usb_cred_tx = usb_cred_tx.lock().await;
                         let _ = usb_cred_tx.insert(cred_tx);
                     }