fix attach to pin issue

core/src/apps/base.py

@@ -664,6 +664,7 @@ def get_pinlocked_handler(
 
     async def wrapper(ctx: wire.Context, msg: wire.Msg) -> protobuf.MessageType:
         await unlock_device(ctx)
+        storage.cache.start_session()
         return await orig_handler(ctx, msg)
 
     return wrapper
@@ -696,11 +697,6 @@ async def handle_GetPassphraseState(
     from trezor.messages import PassphraseState
     from apps.common import passphrase, paths
 
-    # Check if client supports attach pin
-    (
-        hasattr(msg, "allow_create_attach_pin")
-        and msg.allow_create_attach_pin is not None
-    )
     if not device_is_unlocked():
         await unlock_device(ctx, pin_use_type=2)
         session_id = storage.cache.start_session()
@@ -760,12 +756,14 @@ async def handle_UnLockDevice(
     """Handle UnLockDevice message to unlock the device if needed."""
     if not config.is_unlocked():
         await unlock_device(ctx, pin_use_type=2)
+        storage.cache.start_session()
 
     # Get current device state after unlock attempt
     from apps.common import passphrase
 
     unlocked = config.is_unlocked()
     unlocked_attach_pin = passphrase.is_passphrase_pin_enabled() if unlocked else False
+
     passphrase_protection = (
         storage.device.is_passphrase_enabled() if unlocked else False
     )

core/src/apps/homescreen/lockscreen.py

@@ -16,6 +16,7 @@ async def lockscreen() -> None:
     # to an unlocked state.
     try:
         await unlock_device()
+        storage.cache.start_session()
     except wire.PinCancelled:
         pass
 

core/src/apps/webauthn/fido2.py

@@ -663,6 +663,9 @@ async def verify_user(keepalive_callback: KeepaliveCallback) -> bool:
         trezor.pin.keepalive_callback = keepalive_callback
 
         await unlock_device()
+        import storage.cache
+
+        storage.cache.start_session()
         return True
     except Exception:
         return False
@@ -806,6 +809,9 @@ async def confirm_dialog(self) -> bool:
 
         try:
             await unlock_device()
+            import storage.cache
+
+            storage.cache.start_session()
             return True
         except Exception:
             return False

core/src/trezor/uart.py

@@ -160,6 +160,10 @@ async def handle_fingerprint():
                             if __debug__:
                                 print(f"fingerprint unlock result {res}")
                             await base.unlock_device()
+                            import storage.cache
+
+                            storage.cache.start_session()
+
                         # await loop.sleep(2000)
                         return
                 else:
@@ -331,6 +335,9 @@ async def _deal_ble_pair(value):
     if not base.device_is_unlocked():
         try:
             await base.unlock_device()
+            import storage.cache
+
+            storage.cache.start_session()
         except Exception:
             await safe_reloop()
             workflow.spawn(utils.internal_reloop())