Remove bogus Waiting hybrid state

Author: iinuwa

xyz-iinuwa-credential-manager-portal-gtk/src/credential_service/hybrid.rs

@@ -104,13 +104,10 @@ impl HybridHandler for InternalHybridHandler {
 
 #[derive(Clone, Debug)]
 pub(super) enum HybridStateInternal {
-    /// The FIDO string to be displayed to the user, which contains QR secret
-    /// and public key.
+    /// Awaiting BLE advert from phone. Content is the FIDO string to be
+    /// displayed to the user, which contains QR secret and public key.
     Init(String),
 
-    /// Awaiting BLE advert from phone.
-    Waiting,
-
     /// BLE advertisement has been received from phone, tunnel is being established
     Connecting,
 
@@ -129,12 +126,10 @@ pub struct HybridEvent {
 
 #[derive(Clone, Debug)]
 pub enum HybridState {
-    /// The FIDO string to be displayed to the user, which contains QR secret
+    /// Awaiting BLE advert from phone. Content is the FIDO string to be displayed to the user, which contains QR secret
     /// and public key.
     Init(String),
 
-    /// Awaiting BLE advert from phone.
-    Waiting,
     /// BLE advertisement has been received from phone, tunnel is being established
     Connecting,
 
@@ -149,7 +144,6 @@ impl From<HybridStateInternal> for HybridState {
     fn from(value: HybridStateInternal) -> Self {
         match value {
             HybridStateInternal::Init(qr_code) => HybridState::Init(qr_code),
-            HybridStateInternal::Waiting => HybridState::Waiting,
             HybridStateInternal::Connecting => HybridState::Connecting,
             HybridStateInternal::Completed(_) => HybridState::Completed,
             HybridStateInternal::UserCancelled => HybridState::UserCancelled,
@@ -246,7 +240,6 @@ pub(super) mod test {
             DummyHybridStateStream {
                 states: vec![
                     HybridStateInternal::Init(qr_code),
-                    HybridStateInternal::Waiting,
                     HybridStateInternal::Connecting,
                     HybridStateInternal::Completed(response.into()),
                 ],

xyz-iinuwa-credential-manager-portal-gtk/src/credential_service/mod.rs

@@ -242,7 +242,6 @@ mod test {
 
         let hybrid_handler = DummyHybridHandler::new(vec![
             HybridStateInternal::Init(qr_code),
-            HybridStateInternal::Waiting,
             HybridStateInternal::Connecting,
             HybridStateInternal::Completed(authenticator_response),
         ]);

xyz-iinuwa-credential-manager-portal-gtk/src/view_model/mod.rs

@@ -217,11 +217,6 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
                                     .await
                                     .unwrap();
                             }
-                            HybridState::Waiting => {
-                                tx.send(BackgroundEvent::HybridQrStateChanged(state))
-                                    .await
-                                    .unwrap();
-                            }
                             HybridState::Connecting => {
                                 tx.send(BackgroundEvent::HybridQrStateChanged(state))
                                     .await
@@ -343,7 +338,6 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
                                 .await
                                 .unwrap();
                         }
-                        HybridState::Waiting => {}
                         HybridState::Connecting => {
                             self.hybrid_qr_code_data = None;
                             self.tx_update
@@ -431,12 +425,9 @@ pub enum HybridState {
     #[default]
     Idle,
 
-    /// QR code flow is starting
+    /// QR code flow is starting, awaiting QR code scan and BLE advert from phone.
     Started(String),
 
-    /// QR code is being displayed, awaiting QR code scan and BLE advert from phone.
-    Waiting,
-
     /// BLE advert received, connecting to caBLE tunnel with shared secret.
     Connecting,
 
@@ -457,7 +448,6 @@ impl From<crate::credential_service::hybrid::HybridState> for HybridState {
             crate::credential_service::hybrid::HybridState::Init(qr_code) => {
                 HybridState::Started(qr_code)
             }
-            crate::credential_service::hybrid::HybridState::Waiting => HybridState::Waiting,
             crate::credential_service::hybrid::HybridState::Connecting => HybridState::Connecting,
             crate::credential_service::hybrid::HybridState::Completed => HybridState::Completed,
             crate::credential_service::hybrid::HybridState::UserCancelled => {