wip: ui: 0-click credential selection

Author: iinuwa

credentialsd-ui/data/resources/ui/window.ui

@@ -62,6 +62,46 @@
         <child>
           <object class="GtkStack" id="stack">
 
+            <child>
+              <object class="GtkStackPage">
+                <property name="name">start_page</property>
+                <property name="title" translatable="yes">Choose device</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkPicture" id="qr_code_pic">
+                        <binding name="visible">
+                          <lookup name="qr_code_visible">
+                            <lookup name="view-model">
+                              CredentialsUiWindow
+                            </lookup>
+                          </lookup>
+                        </binding>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="label" translatable="yes">Scan the QR code above with another device, or tap or activate your security key</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <binding name="label">
+                          <lookup name="prompt">
+                            <lookup name="view-model">
+                              CredentialsUiWindow
+                            </lookup>
+                          </lookup>
+                        </binding>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
+            </child>
+
+
             <child>
               <object class="GtkStackPage">
                 <property name="name">choose_device</property>
@@ -151,6 +191,7 @@
                         </binding>
                       </object>
                     </child>
+                    <!--
                     <child>
                       <object class="GtkPicture" id="qr_code_pic">
                         <binding name="visible">
@@ -162,6 +203,7 @@
                         </binding>
                       </object>
                     </child>
+                    -->
                     <child>
                       <object class="GtkLabel">
                         <binding name="label">

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

@@ -238,7 +238,14 @@ impl ViewModel {
                 }
 
                 Event::Background(BackgroundEvent::UsbConnected) => {
-                    info!("Found USB device")
+                    info!("Found USB device");
+                    self.tx_update
+                        .send(ViewUpdate::WaitingForDevice(Device {
+                            id: "TODO: bogus".to_string(),
+                            transport: Transport::Usb,
+                        }))
+                        .await
+                        .unwrap();
                 }
                 // TODO: Add this event
                 // Event::Background(BackgroundEvent::DevicesUpdated(devices)) => {
@@ -332,7 +339,14 @@ impl ViewModel {
                         .unwrap()
                 }
                 Event::Background(BackgroundEvent::NfcConnected) => {
-                    info!("Found NFC device")
+                    info!("Found NFC device");
+                    self.tx_update
+                        .send(ViewUpdate::WaitingForDevice(Device {
+                            id: "TODO: bogus".to_string(),
+                            transport: Transport::Nfc,
+                        }))
+                        .await
+                        .unwrap();
                 }
 
                 Event::Background(BackgroundEvent::NfcIdle | BackgroundEvent::NfcWaiting) => {}
@@ -348,6 +362,13 @@ impl ViewModel {
                 }
                 Event::Background(BackgroundEvent::HybridConnecting) => {
                     self.hybrid_qr_code_data = None;
+                    self.tx_update
+                        .send(ViewUpdate::WaitingForDevice(Device {
+                            id: "TODO: bogus".to_string(),
+                            transport: Transport::HybridQr,
+                        }))
+                        .await
+                        .unwrap();
                     self.tx_update
                         .send(ViewUpdate::HybridConnecting)
                         .await

credentialsd/src/credential_service/usb.rs

@@ -46,9 +46,13 @@ impl InProcessUsbHandler {
                 if hid_devices.is_empty() {
                     let state = UsbStateInternal::Waiting;
                     Ok(state)
-                } else if hid_devices.len() == 1 {
+                }
+                /*
+                else if hid_devices.len() == 1 {
                     Ok(UsbStateInternal::Connected(hid_devices.swap_remove(0)))
-                } else {
+                }
+                */
+                else {
                     Ok(UsbStateInternal::SelectingDevice(hid_devices))
                 }
             }