Skip to content

Commit fdd458e

Browse files
authored
fix: remove the attach to pin version restriction (#382)
* remove the attach to pin version restriction
1 parent b77b710 commit fdd458e

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

core/src/apps/base.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,15 @@ def get_features() -> Features:
168168
f.attach_to_pin_user = False
169169
# private fields:
170170
if config.is_unlocked():
171-
# passphrase_protection is private, see #1807
172-
f.passphrase_protection = storage.device.is_passphrase_enabled()
171+
import apps.common.passphrase as passphrase
172+
173+
if (
174+
not has_attach_to_pin_capability()
175+
and passphrase.is_passphrase_pin_enabled()
176+
):
177+
f.passphrase_protection = False
178+
else:
179+
f.passphrase_protection = storage.device.is_passphrase_enabled()
173180
f.needs_backup = storage.device.needs_backup()
174181
f.unfinished_backup = storage.device.unfinished_backup()
175182
f.no_backup = storage.device.no_backup()
@@ -183,7 +190,6 @@ def get_features() -> Features:
183190
f.auto_lock_delay_ms = storage.device.get_autolock_delay_ms()
184191
f.display_rotation = storage.device.get_rotation()
185192
f.experimental_features = storage.device.get_experimental_features()
186-
from apps.common import passphrase
187193

188194
f.unlocked_attach_pin = passphrase.is_passphrase_pin_enabled()
189195

core/src/apps/workflow_handlers.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,6 @@ def _wrap_with_version_check(handler):
458458
async def wrapper(ctx, msg):
459459
# Execute the original handler
460460
result = await handler(ctx, msg)
461-
from apps.base import check_version_compatibility
462-
463-
check_version_compatibility()
464461
return result
465462

466463
return wrapper

0 commit comments

Comments
 (0)