Emit Connected state when hybrid tunnel is established

Author: iinuwa

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

@@ -111,6 +111,9 @@ pub(super) enum HybridStateInternal {
     /// BLE advertisement has been received from phone, tunnel is being established
     Connecting,
 
+    /// Hybrid tunnel has been established
+    Connected,
+
     /// Authenticator data
     Completed(AuthenticatorResponse),
 
@@ -133,6 +136,9 @@ pub enum HybridState {
     /// BLE advertisement has been received from phone, tunnel is being established
     Connecting,
 
+    /// Tunnel is established, waiting for user to release credential on their device.
+    Connected,
+
     /// Authenticator data
     Completed,
 
@@ -145,6 +151,7 @@ impl From<HybridStateInternal> for HybridState {
         match value {
             HybridStateInternal::Init(qr_code) => HybridState::Init(qr_code),
             HybridStateInternal::Connecting => HybridState::Connecting,
+            HybridStateInternal::Connected => HybridState::Connected,
             HybridStateInternal::Completed(_) => HybridState::Completed,
             HybridStateInternal::UserCancelled => HybridState::UserCancelled,
         }

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

@@ -162,10 +162,18 @@ impl ViewModel {
                                     view_model.set_qr_code_visible(false);
                                     _ = view_model.qr_code_paintable().take();
                                     view_model.set_prompt(
-                                        "Device connected. Follow the instructions on your device",
+                                        "Connecting to your device. Make sure both devices are near each other and have Bluetooth enabled.",
                                     );
                                     view_model.set_qr_spinner_visible(true);
                                 }
+                                ViewUpdate::HybridConnected => {
+                                    view_model.set_qr_code_visible(false);
+                                    _ = view_model.qr_code_paintable().take();
+                                    view_model.set_prompt(
+                                        "Device connected. Follow the instructions on your device",
+                                    );
+                                    view_model.set_qr_spinner_visible(false);
+                                }
                                 ViewUpdate::Completed => {
                                     view_model.set_qr_spinner_visible(false);
                                     view_model.set_completed(true);

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

@@ -222,6 +222,11 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
                                     .await
                                     .unwrap();
                             }
+                            HybridState::Connected => {
+                                tx.send(BackgroundEvent::HybridQrStateChanged(state))
+                                    .await
+                                    .unwrap();
+                            }
                             HybridState::Completed => {
                                 tx.send(BackgroundEvent::HybridQrStateChanged(state))
                                     .await
@@ -345,6 +350,13 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
                                 .await
                                 .unwrap();
                         }
+                        HybridState::Connected => {
+                            self.hybrid_qr_code_data = None;
+                            self.tx_update
+                                .send(ViewUpdate::HybridConnected)
+                                .await
+                                .unwrap();
+                        }
                         HybridState::Completed => {
                             self.hybrid_qr_code_data = None;
                             self.tx_update.send(ViewUpdate::Completed).await.unwrap();
@@ -381,6 +393,7 @@ pub enum ViewUpdate {
 
     HybridNeedsQrCode(String),
     HybridConnecting,
+    HybridConnected,
 }
 
 pub enum BackgroundEvent {
@@ -431,10 +444,9 @@ pub enum HybridState {
     /// BLE advert received, connecting to caBLE tunnel with shared secret.
     Connecting,
 
-    /*  I don't think is necessary to signal.
-       /// Connected to device via caBLE tunnel.
-       Connected,
-    */
+    /// Connected to device via caBLE tunnel.
+    Connected,
+
     /// Credential received over tunnel.
     Completed,
 
@@ -449,6 +461,7 @@ impl From<crate::credential_service::hybrid::HybridState> for HybridState {
                 HybridState::Started(qr_code)
             }
             crate::credential_service::hybrid::HybridState::Connecting => HybridState::Connecting,
+            crate::credential_service::hybrid::HybridState::Connected => HybridState::Connected,
             crate::credential_service::hybrid::HybridState::Completed => HybridState::Completed,
             crate::credential_service::hybrid::HybridState::UserCancelled => {
                 HybridState::UserCancelled