trezor pin dialog: only show PIN "strength" when creating/changing

fixes #4832
This commit is contained in:
SomberNight
2020-04-07 18:56:14 +02:00
parent 5259fcb6fd
commit caefea19dd
9 changed files with 35 additions and 22 deletions
+6 -2
View File
@@ -1,5 +1,6 @@
import time
from struct import pack
from typing import Optional
from electrum import ecc
from electrum.i18n import _
@@ -7,11 +8,12 @@ from electrum.util import UserCancelled
from electrum.keystore import bip39_normalize_passphrase
from electrum.bip32 import BIP32Node, convert_bip32_path_to_list_of_uint32
from electrum.logging import Logger
from electrum.plugins.hw_wallet.plugin import HardwareClientBase
from electrum.plugins.hw_wallet.plugin import HardwareClientBase, HardwareHandlerBase
class GuiMixin(object):
# Requires: self.proto, self.device
handler: Optional[HardwareHandlerBase]
# ref: https://github.com/trezor/trezor-common/blob/44dfb07cfaafffada4b2ce0d15ba1d90d17cf35e/protob/types.proto#L89
messages = {
@@ -47,6 +49,7 @@ class GuiMixin(object):
return self.proto.ButtonAck()
def callback_PinMatrixRequest(self, msg):
show_strength = True
if msg.type == 2:
msg = _("Enter a new PIN for your {}:")
elif msg.type == 3:
@@ -54,7 +57,8 @@ class GuiMixin(object):
"NOTE: the positions of the numbers have changed!"))
else:
msg = _("Enter your current {} PIN:")
pin = self.handler.get_pin(msg.format(self.device))
show_strength = False
pin = self.handler.get_pin(msg.format(self.device), show_strength=show_strength)
if len(pin) > 9:
self.handler.show_error(_('The PIN cannot be longer than 9 characters.'))
pin = '' # to cancel below
+5 -5
View File
@@ -38,24 +38,24 @@ PASSPHRASE_NOT_PIN = _(
class QtHandler(QtHandlerBase):
pin_signal = pyqtSignal(object)
pin_signal = pyqtSignal(object, object)
def __init__(self, win, pin_matrix_widget_class, device):
super(QtHandler, self).__init__(win, device)
self.pin_signal.connect(self.pin_dialog)
self.pin_matrix_widget_class = pin_matrix_widget_class
def get_pin(self, msg):
def get_pin(self, msg, *, show_strength=True):
self.done.clear()
self.pin_signal.emit(msg)
self.pin_signal.emit(msg, show_strength)
self.done.wait()
return self.response
def pin_dialog(self, msg):
def pin_dialog(self, msg, show_strength):
# Needed e.g. when resetting a device
self.clear_dialog()
dialog = WindowModalDialog(self.top_level_window(), _("Enter PIN"))
matrix = self.pin_matrix_widget_class()
matrix = self.pin_matrix_widget_class(show_strength)
vbox = QVBoxLayout()
vbox.addWidget(QLabel(msg))
vbox.addWidget(matrix)