Skip to content

Commit 850f92c

Browse files
authored
Merge pull request #257 from LedgerHQ/y333/support_no_settings_ngbl_home
When no settings set, pass NULL pointer to C NBGL API
2 parents 78e568a + f0f51ec commit 850f92c

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ledger_device_sdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ledger_device_sdk"
3-
version = "1.22.3"
3+
version = "1.22.4"
44
authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
55
edition = "2021"
66
license.workspace = true

ledger_device_sdk/src/nbgl/nbgl_home_and_settings.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ impl<'a> NbglHomeAndSettings {
195195
__bindgen_anon_1: nbgl_genericContents_t__bindgen_ty_1 {
196196
contentsList: &self.content as *const nbgl_content_t,
197197
},
198-
nbContents: if self.nb_settings > 0 { 1 } else { 0 },
198+
nbContents: self.nb_settings,
199199
};
200200

201201
self.ux_sync_init();
@@ -207,7 +207,10 @@ impl<'a> NbglHomeAndSettings {
207207
PageIndex::Home => INIT_HOME_PAGE as u8,
208208
PageIndex::Settings(idx) => idx,
209209
},
210-
&self.generic_contents as *const nbgl_genericContents_t,
210+
match self.nb_settings {
211+
0 => core::ptr::null(),
212+
_ => &self.generic_contents as *const nbgl_genericContents_t,
213+
},
211214
&self.info_list as *const nbgl_contentInfoList_t,
212215
core::ptr::null(),
213216
Some(quit_callback),
@@ -282,7 +285,7 @@ impl<'a> NbglHomeAndSettings {
282285
__bindgen_anon_1: nbgl_genericContents_t__bindgen_ty_1 {
283286
contentsList: &self.content as *const nbgl_content_t,
284287
},
285-
nbContents: if self.nb_settings > 0 { 1 } else { 0 },
288+
nbContents: self.nb_settings,
286289
};
287290

288291
nbgl_useCaseHomeAndSettings(
@@ -293,7 +296,10 @@ impl<'a> NbglHomeAndSettings {
293296
PageIndex::Home => INIT_HOME_PAGE as u8,
294297
PageIndex::Settings(idx) => idx,
295298
},
296-
&self.generic_contents as *const nbgl_genericContents_t,
299+
match self.nb_settings {
300+
0 => core::ptr::null(),
301+
_ => &self.generic_contents as *const nbgl_genericContents_t,
302+
},
297303
&self.info_list as *const nbgl_contentInfoList_t,
298304
core::ptr::null(),
299305
Some(quit_cb),

0 commit comments

Comments
 (0)