Keep backward compatibility with show() API

Author: yogh333

ledger_device_sdk/src/nbgl.rs

@@ -1,4 +1,4 @@
-use crate::io::{ApduHeader, Comm};
+use crate::io::{ApduHeader, Comm, Event, Reply};
 use crate::nvm::*;
 use const_zero::const_zero;
 extern crate alloc;

ledger_device_sdk/src/nbgl/nbgl_home_and_settings.rs

@@ -56,6 +56,12 @@ unsafe extern "C" fn quit_callback() {
     exit_app(0);
 }
 
+impl SyncNBGL for NbglHomeAndSettings {}
+
+unsafe extern "C" fn quit_cb() {
+    exit_app(0);
+}
+
 impl<'a> NbglHomeAndSettings {
     pub fn new() -> NbglHomeAndSettings {
         NbglHomeAndSettings {
@@ -118,7 +124,87 @@ impl<'a> NbglHomeAndSettings {
         }
     }
 
-    pub fn show(&mut self) {
+    pub fn show<T: TryFrom<ApduHeader>>(&mut self) -> Event<T>
+    where
+        Reply: From<<T as TryFrom<ApduHeader>>::Error>,
+    {
+        unsafe {
+            loop {
+                self.info_contents_ptr = self
+                    .info_contents
+                    .iter()
+                    .map(|s| s.as_ptr())
+                    .collect::<Vec<_>>();
+
+                self.info_list = nbgl_contentInfoList_t {
+                    infoTypes: INFO_FIELDS.as_ptr() as *const *const c_char,
+                    infoContents: self.info_contents_ptr[..].as_ptr() as *const *const c_char,
+                    nbInfos: INFO_FIELDS.len() as u8,
+                };
+
+                for (i, setting) in self.setting_contents.iter().enumerate() {
+                    SWITCH_ARRAY[i].text = setting[0].as_ptr();
+                    SWITCH_ARRAY[i].subText = setting[1].as_ptr();
+                    let state = if let Some(data) = NVM_REF.as_mut() {
+                        data.get_ref()[i]
+                    } else {
+                        OFF_STATE
+                    };
+                    SWITCH_ARRAY[i].initState = state;
+                    SWITCH_ARRAY[i].token = (FIRST_USER_TOKEN + i as u32) as u8;
+                    SWITCH_ARRAY[i].tuneId = TuneIndex::TapCasual as u8;
+                }
+
+                self.content = nbgl_content_t {
+                    content: nbgl_content_u {
+                        switchesList: nbgl_pageSwitchesList_s {
+                            switches: &SWITCH_ARRAY as *const nbgl_contentSwitch_t,
+                            nbSwitches: self.nb_settings,
+                        },
+                    },
+                    contentActionCallback: Some(settings_callback),
+                    type_: SWITCHES_LIST,
+                };
+
+                self.generic_contents = nbgl_genericContents_t {
+                    callbackCallNeeded: false,
+                    __bindgen_anon_1: nbgl_genericContents_t__bindgen_ty_1 {
+                        contentsList: &self.content as *const nbgl_content_t,
+                    },
+                    nbContents: if self.nb_settings > 0 { 1 } else { 0 },
+                };
+
+                self.ux_sync_init();
+                nbgl_useCaseHomeAndSettings(
+                    self.app_name.as_ptr() as *const c_char,
+                    &self.icon as *const nbgl_icon_details_t,
+                    core::ptr::null(),
+                    INIT_HOME_PAGE as u8,
+                    &self.generic_contents as *const nbgl_genericContents_t,
+                    &self.info_list as *const nbgl_contentInfoList_t,
+                    core::ptr::null(),
+                    Some(quit_callback),
+                );
+                match self.ux_sync_wait(true) {
+                    SyncNbgl::UxSyncRetApduReceived => {
+                        if let Some(comm) = COMM_REF.as_mut() {
+                            if let Some(value) = comm.check_event() {
+                                return value;
+                            }
+                        }
+                    }
+                    SyncNbgl::UxSyncRetQuitted => {
+                        exit_app(0);
+                    }
+                    _ => {
+                        panic!("Unexpected return value from ux_sync_homeAndSettings");
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn display(&mut self) {
         unsafe {
             self.info_contents_ptr = self
                 .info_contents
@@ -172,7 +258,7 @@ impl<'a> NbglHomeAndSettings {
                 &self.generic_contents as *const nbgl_genericContents_t,
                 &self.info_list as *const nbgl_contentInfoList_t,
                 core::ptr::null(),
-                Some(quit_callback),
+                Some(quit_cb),
             );
         }
     }