fix initialize logic

Author: guowei0105

core/src/apps/base.py

@@ -252,17 +252,9 @@ async def handle_Initialize(
     else:
         storage.cache.delete(storage.cache.APP_COMMON_CLIENT_CONTAINS_ATTACH)
 
-    prev_session_id = storage.cache.get_session_id()
-
-    from apps.common import passphrase
-
-    passphrase_pin_enabled = passphrase.is_passphrase_pin_enabled()
     if (
-        device_is_unlocked()
-        and prev_session_id != msg.session_id
-        and hasattr(msg, "passphrase_state")
+        hasattr(msg, "passphrase_state")
         and msg.passphrase_state is not None
-        and passphrase_pin_enabled
         and msg.passphrase_state != ""
         and se_thd89.check_passphrase_btc_test_address(
             msg.passphrase_state
@@ -271,8 +263,17 @@ async def handle_Initialize(
         )
     ):
         session_id = storage.cache.start_session()
+    elif msg.session_id is not None:
+        if (
+            not hasattr(msg, "passphrase_state")
+            or msg.passphrase_state is None
+            or msg.passphrase_state == ""
+        ):
+            session_id = storage.cache.start_session()
+        else:
+            session_id = storage.cache.start_session(msg.session_id)
     else:
-        session_id = storage.cache.start_session(msg.session_id)
+        session_id = storage.cache.start_session()
     if not utils.BITCOIN_ONLY:
         if utils.USE_THD89:
             if msg.derive_cardano is not None and msg.derive_cardano:
@@ -664,7 +665,6 @@ 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
@@ -756,7 +756,6 @@ 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=PinType.USER_AND_PASSPHRASE_PIN)
-        storage.cache.start_session()
 
     # Get current device state after unlock attempt
     from apps.common import passphrase

core/src/apps/homescreen/lockscreen.py

@@ -16,7 +16,6 @@ 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,9 +663,6 @@ 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
@@ -809,9 +806,6 @@ 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/boot.py

@@ -36,7 +36,6 @@ async def bootscreen() -> None:
             from apps.common.pin_constants import PinType
 
             await verify_user_pin(pin_use_type=PinType.USER_AND_PASSPHRASE_PIN)
-            storage.cache.start_session()
             storage.init_unlocked()
             loop.close(lvgl_task)
             return

core/src/trezor/uart.py

@@ -160,9 +160,6 @@ 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
@@ -335,9 +332,6 @@ 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())