arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-19 14:08:11 +00:00
Code Issues Releases Wiki Activity

fix(core/rust): allow for cycling through the last character in TT passphrase

Browse Source
This commit is contained in:
grdddj 2023-05-04 16:18:29 +02:00 committed by Martin Milata
parent c4bbf17433
commit 74246150e5
1 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
core/embed/rust/src/ui/model_tt/component/keyboard/passphrase.rs
View File

@ -132,17 +132,42 @@ impl PassphraseKeyboard {
/// When the input has reached max length, disable all the input buttons. /// When the input has reached max length, disable all the input buttons.
fn update_input_btns_state(&mut self, ctx: &mut EventCtx) { fn update_input_btns_state(&mut self, ctx: &mut EventCtx) {
for btn in self.keys.iter_mut() { let active_states = self.get_buttons_active_states();
for (key, btn) in self.keys.iter_mut().enumerate() {
btn.mutate(ctx, |ctx, b| { btn.mutate(ctx, |ctx, b| {
if self.input.inner().textbox.is_full() { if active_states[key] {
b.disable(ctx);
} else {
b.enable(ctx); b.enable(ctx);
} else {
b.disable(ctx);
} }
}); });
} }
} }
/// Precomputing the active states not to overlap borrows in
/// `self.keys.iter_mut` loop.
fn get_buttons_active_states(&self) -> [bool; KEY_COUNT] {
let mut active_states: [bool; KEY_COUNT] = [false; KEY_COUNT];
for (key, state) in active_states.iter_mut().enumerate() {
*state = self.is_button_active(key);
}
active_states
}
/// We should disable the input when the passphrase has reached maximum
/// length and we are not cycling through the characters.
fn is_button_active(&self, key: usize) -> bool {
let textbox_not_full = !self.input.inner().textbox.is_full();
let key_is_pending = {
if let Some(pending) = self.input.inner().multi_tap.pending_key() {
pending == key
} else {
false
}
};
textbox_not_full || key_is_pending
}
pub fn passphrase(&self) -> &str { pub fn passphrase(&self) -> &str {
self.input.inner().textbox.content() self.input.inner().textbox.content()
} }
@ -234,19 +259,23 @@ impl Component for PassphraseKeyboard {
// Process key button events in case we did not reach maximum passphrase length. // Process key button events in case we did not reach maximum passphrase length.
// (All input buttons should be disallowed in that case, this is just a safety // (All input buttons should be disallowed in that case, this is just a safety
// measure.) // measure.)
if !self.input.inner().textbox.is_full() { // Also we need to allow for cycling through the last character.
for (key, btn) in self.keys.iter_mut().enumerate() { let active_states = self.get_buttons_active_states();
if let Some(ButtonMsg::Clicked) = btn.event(ctx, event) { for (key, btn) in self.keys.iter_mut().enumerate() {
// Key button was clicked. If this button is pending, let's cycle the pending if !active_states[key] {
// character in textbox. If not, let's just append the first character. // Button is not active
let text = Self::key_text(btn.inner().content()); continue;
self.input.mutate(ctx, |ctx, i| { }
let edit = i.multi_tap.click_key(ctx, key, text); if let Some(ButtonMsg::Clicked) = btn.event(ctx, event) {
i.textbox.apply(ctx, edit); // Key button was clicked. If this button is pending, let's cycle the pending
}); // character in textbox. If not, let's just append the first character.
self.after_edit(ctx); let text = Self::key_text(btn.inner().content());
return None; self.input.mutate(ctx, |ctx, i| {
} let edit = i.multi_tap.click_key(ctx, key, text);
i.textbox.apply(ctx, edit);
});
self.after_edit(ctx);
return None;
} }
} }
None None