Remove unneeded selected_credential infrastructure

Author: msirringhaus

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

@@ -39,9 +39,6 @@ mod imp {
         #[property(get, set)]
         pub selected_device: RefCell<Option<DeviceObject>>,
 
-        #[property(get, set)]
-        pub selected_credential: RefCell<Option<String>>,
-
         #[property(get, set)]
         pub usb_pin_entry_visible: RefCell<bool>,
 
@@ -124,9 +121,6 @@ impl ViewModel {
                                 ViewUpdate::WaitingForDevice(device) => {
                                     view_model.waiting_for_device(&device)
                                 }
-                                ViewUpdate::SelectCredential(cred_id) => {
-                                    view_model.select_credential(cred_id)
-                                }
                                 ViewUpdate::UsbNeedsPin { attempts_left } => {
                                     let prompt = match attempts_left {
                                         Some(1) => {
@@ -298,18 +292,12 @@ impl ViewModel {
         }
         let device_object: DeviceObject = device.into();
         self.set_selected_device(device_object);
-        self.set_selected_credential("");
     }
 
     fn selecting_device(&self) {
         self.set_prompt("Multiple devices found. Please select with which to proceed.");
     }
 
-    fn select_credential(&self, cred_id: String) {
-        // todo: Do we still need this?
-        self.set_selected_credential(cred_id);
-    }
-
     pub async fn send_thingy(&self) {
         self.send_event(ViewEvent::ButtonClicked).await;
     }

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

@@ -28,7 +28,6 @@ where
     // This includes devices like platform authenticator, USB, hybrid
     devices: Vec<Device>,
     selected_device: Option<Device>,
-    selected_credential: Option<String>,
 
     providers: Vec<Provider>,
 
@@ -59,7 +58,6 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
             title: String::default(),
             devices: Vec::new(),
             selected_device: None,
-            selected_credential: None,
             providers: Vec::new(),
             usb_pin_tx: None,
             usb_cred_tx: None,
@@ -154,11 +152,6 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
                     todo!();
                 }
             };
-            // Remove the attribute below when we implement cancellation for at least one transport.
-            #[allow(unreachable_code)]
-            {
-                self.selected_credential = None;
-            }
         }
 
         // start discovery for newly selected device
@@ -280,18 +273,12 @@ impl<C: CredentialServiceClient + Send> ViewModel<C> {
                         "Credential selected: {:?}. Current Device: {:?}",
                         cred_id, self.selected_device
                     );
-                    // TODO: Do we still need this?
-                    self.selected_credential = Some(cred_id.clone());
 
                     if let Some(cred_tx) = self.usb_cred_tx.take() {
                         if cred_tx.lock().await.send(cred_id.clone()).await.is_err() {
                             error!("Failed to send selected credential to device");
                         }
                     }
-                    self.tx_update
-                        .send(ViewUpdate::SelectCredential(cred_id))
-                        .await
-                        .unwrap();
                 }
 
                 Event::Background(BackgroundEvent::UsbPressed) => {
@@ -400,7 +387,6 @@ pub enum ViewUpdate {
     SetDevices(Vec<Device>),
     SetCredentials(Vec<Credential>),
     WaitingForDevice(Device),
-    SelectCredential(String),
     UsbNeedsPin { attempts_left: Option<u32> },
     UsbNeedsUserVerification { attempts_left: Option<u32> },
     UsbNeedsUserPresence,

xyz-iinuwa-credential-manager-portal-gtk/src/window.rs

@@ -183,27 +183,6 @@ impl ExampleApplicationWindow {
             }
         ));
 
-        view_model.connect_selected_credential_notify(clone!(
-            #[weak]
-            stack,
-            move |vm| {
-                let c = vm.selected_credential();
-                if c.is_none() || c.unwrap().is_empty() {
-                    return;
-                }
-
-                let d = vm.selected_device();
-                let d = d
-                    .and_downcast_ref::<DeviceObject>()
-                    .expect("selected device to exist at notify");
-                match d.transport().try_into() {
-                    Ok(Transport::Usb) => stack.set_visible_child_name("usb"),
-                    Ok(Transport::HybridQr) => stack.set_visible_child_name("hybrid_qr"),
-                    _ => {}
-                };
-            }
-        ));
-
         view_model.connect_completed_notify(clone!(
             #[weak]
             stack,