fix(legacy): fix OK-19317 (#392)

OneKeyHQ · May 11, 2023 · 0bf60dd · 0bf60dd
1 parent 6d616dc
commit 0bf60dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/legacy/firmware/layout2.c b/legacy/firmware/layout2.c
@@ -591,7 +591,7 @@ void onboarding(uint8_t key) {
                                 "have fun\nwith your OneKey Classic."),
                               NULL, NULL, NULL, NULL);
         key = protectWaitKey(0, 1);
-        if (protectAbortedByInitialize) return;
+        if (protectAbortedByInitializeOnboarding) return;
         if (key != KEY_CONFIRM) {
           goto done1;
         }
@@ -610,7 +610,7 @@ void onboarding(uint8_t key) {
           oledRefresh();
         }
         key = protectWaitKey(0, 1);
-        if (protectAbortedByInitialize) return;
+        if (protectAbortedByInitializeOnboarding) return;
         if (key != KEY_CONFIRM) {
           goto done1;
         }
@@ -629,7 +629,7 @@ void onboarding(uint8_t key) {
           oledRefresh();
         }
         key = protectWaitKey(0, 1);
-        if (protectAbortedByInitialize) return;
+        if (protectAbortedByInitializeOnboarding) return;
         if (key != KEY_CONFIRM) {
           goto done2;
         }

diff --git a/legacy/firmware/protect.c b/legacy/firmware/protect.c
@@ -42,6 +42,8 @@
 #define MAX_WRONG_PINS 15
 
 bool protectAbortedByCancel = false;
+// allow the app to connect to the device when in the tutorial page
+bool protectAbortedByInitializeOnboarding = false;
 bool protectAbortedByInitialize = false;
 bool protectAbortedByTimeout = false;
 extern bool exitBlindSignByInitialize;
@@ -751,6 +753,7 @@ uint8_t protectWaitKey(uint32_t time_out, uint8_t mode) {
   uint8_t key = KEY_NULL;
 
   protectAbortedByInitialize = false;
+  protectAbortedByInitializeOnboarding = false;
   usbTiny(1);
   timer_out_set(timer_out_oper, time_out);
   while (1) {
@@ -784,6 +787,7 @@ uint8_t protectWaitKey(uint32_t time_out, uint8_t mode) {
     }
   }
   usbTiny(0);
+  protectAbortedByInitializeOnboarding = protectAbortedByInitialize;
   if (protectAbortedByInitialize) {
     if (device_sleep_state) device_sleep_state = SLEEP_CANCEL_BY_USB;
     fsm_sendFailure(FailureType_Failure_ActionCancelled, NULL);

diff --git a/legacy/firmware/protect.h b/legacy/firmware/protect.h
@@ -65,5 +65,6 @@ void enter_sleep(void);
 
 extern bool protectAbortedByCancel;
 extern bool protectAbortedByInitialize;
+extern bool protectAbortedByInitializeOnboarding;
 extern bool protectAbortedByTimeout;
 #endif