Remaining changes (#61)

Do not allow triggering screen saver/lock during transaction review/sign

Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "babylon-ledger-app"
-version = "0.7.21"
+version = "0.7.24"
 authors = ["siy"]
 edition = "2021"
 description = "Radix Babylon"
 
 [dependencies]
-ledger_device_sdk = "1.1.0"
-ledger_secure_sdk_sys = "1.0.2"
+ledger_device_sdk = "1.4.2"
+ledger_secure_sdk_sys = "1.1.0"
 include_gif = "1.0.1"
 
 sbor = { path = "./sbor", default-features = false }

src/ui/menu.rs

@@ -4,6 +4,7 @@ use ledger_device_sdk::ui::gadgets::{clear_screen, get_event};
 use ledger_device_sdk::ui::layout::Draw;
 use ledger_device_sdk::ui::screen_util::screen_update;
 
+use crate::io::UxEvent;
 use crate::ui::utils::{CenteredText, LeftAlignedMiddle};
 
 pub enum MenuFeature<'a> {
@@ -70,7 +71,10 @@ impl<'a> Menu<'a> {
         self.display();
 
         loop {
-            if let Some(event) = get_event(&mut buttons) {
+            let event = get_event(&mut buttons);
+
+            if let Some(event) = event {
+                UxEvent::wakeup();
                 if self.handle(event) {
                     break;
                 }

src/ui/multiline_scroller.rs

@@ -6,6 +6,8 @@ use ledger_device_sdk::ui::gadgets::{clear_screen, get_event};
 use ledger_device_sdk::ui::layout::{Draw, Location};
 use ledger_device_sdk::ui::SCREEN_HEIGHT;
 
+use crate::io::UxEvent;
+
 pub struct MultilineMessageScroller<'a> {
     message: &'a str,
     title: Option<&'a str>,
@@ -131,7 +133,13 @@ impl<'a> MultilineMessageScroller<'a> {
         draw(cur_page);
 
         loop {
-            match get_event(&mut buttons) {
+            let event = get_event(&mut buttons);
+
+            if event.is_some() {
+                UxEvent::wakeup();
+            }
+
+            match event {
                 Some(ButtonEvent::LeftButtonPress) => {
                     LEFT_S_ARROW.instant_display();
                 }

src/ui/multipage_validator.rs

@@ -7,6 +7,8 @@ use ledger_device_sdk::ui::gadgets::{clear_screen, get_event};
 use ledger_device_sdk::ui::layout::{Draw, Layout, Location, StringPlace};
 use ledger_device_sdk::ui::screen_util;
 
+use crate::io::UxEvent;
+
 pub struct MultipageValidator<'a> {
     message: &'a [&'a str],
     confirm: &'a [&'a str],
@@ -73,7 +75,13 @@ impl<'a> MultipageValidator<'a> {
 
         let mut buttons = ButtonsState::new();
         loop {
-            match get_event(&mut buttons) {
+            let event = get_event(&mut buttons);
+
+            if event.is_some() {
+                UxEvent::wakeup();
+            }
+
+            match event {
                 Some(ButtonEvent::LeftButtonPress) => {
                     LEFT_S_ARROW.instant_display();
                 }

src/ui/single_message.rs

@@ -4,6 +4,7 @@ use ledger_device_sdk::ui::gadgets::{clear_screen, get_event};
 use ledger_device_sdk::ui::layout::Draw;
 use ledger_device_sdk::ui::SCREEN_WIDTH;
 
+use crate::io::UxEvent;
 use crate::ui::utils::CenteredText;
 
 pub enum MessageFeature<'a> {
@@ -77,7 +78,13 @@ impl<'a> SingleMessage<'a> {
         self.show();
 
         loop {
-            match get_event(&mut buttons) {
+            let event = get_event(&mut buttons);
+
+            if event.is_some() {
+                UxEvent::wakeup();
+            }
+
+            match event {
                 Some(ButtonEvent::LeftButtonRelease)
                 | Some(ButtonEvent::RightButtonRelease)
                 | Some(ButtonEvent::BothButtonsRelease) => return,

test/test-get-application-version.py

@@ -23,5 +23,5 @@
 print("Testing", "GetAppVersion", instructionCode, end=" ")
 response = dongle.exchange(bytes.fromhex(instructionClass + instructionCode + p1 + p2 + dataLength))
 
-assert response.hex() == '000715', "Invalid version\nReceived:" + response.hex()
+assert response.hex() == '000718', "Invalid version\nReceived:" + response.hex()
 print("Success")