Struan Clark 2 anni fa
parent
commit
2c771e3940
2 ha cambiato i file con 17 aggiunte e 13 eliminazioni
  1. 8 4
      flipbip.c
  2. 9 9
      views/flipbip_scene_1.c

+ 8 - 4
flipbip.c

@@ -46,13 +46,17 @@ static void text_input_callback(void* context) {
 
 
                 int status = FlipBipStatusSuccess;
                 int status = FlipBipStatusSuccess;
                 // Check if the mnemonic is valid
                 // Check if the mnemonic is valid
-                if(mnemonic_check(app->import_mnemonic_text) == 0) status = FlipBipStatusMnemonicCheckError; // 13 = mnemonic check error
+                if(mnemonic_check(app->import_mnemonic_text) == 0)
+                    status = FlipBipStatusMnemonicCheckError; // 13 = mnemonic check error
                 // Save the mnemonic to persistent storage
                 // Save the mnemonic to persistent storage
-                else if(!flipbip_save_settings_secure(app->import_mnemonic_text)) status = FlipBipStatusSaveError; // 12 = save error
-                
-                if (status == FlipBipStatusSuccess) {
+                else if(!flipbip_save_settings_secure(app->import_mnemonic_text))
+                    status = FlipBipStatusSaveError; // 12 = save error
+
+                if(status == FlipBipStatusSuccess) {
+                    //notification_message(app->notification, &sequence_blink_cyan_100);
                     flipbip_play_happy_bump(app);
                     flipbip_play_happy_bump(app);
                 } else {
                 } else {
+                    //notification_message(app->notification, &sequence_blink_red_100);
                     flipbip_play_long_bump(app);
                     flipbip_play_long_bump(app);
                 }
                 }
 
 

+ 9 - 9
views/flipbip_scene_1.c

@@ -315,9 +315,11 @@ static int flipbip_scene_1_model_init(
         // Generate a random mnemonic using trezor-crypto
         // Generate a random mnemonic using trezor-crypto
         const char* mnemonic_gen = mnemonic_generate(strength);
         const char* mnemonic_gen = mnemonic_generate(strength);
         // Check if the mnemonic is valid
         // Check if the mnemonic is valid
-        if(mnemonic_check(mnemonic_gen) == 0) return FlipBipStatusMnemonicCheckError; // 13 = mnemonic check error
+        if(mnemonic_check(mnemonic_gen) == 0)
+            return FlipBipStatusMnemonicCheckError; // 13 = mnemonic check error
         // Save the mnemonic to persistent storage
         // Save the mnemonic to persistent storage
-        else if(!flipbip_save_settings_secure(mnemonic_gen)) return FlipBipStatusSaveError; // 12 = save error
+        else if(!flipbip_save_settings_secure(mnemonic_gen))
+            return FlipBipStatusSaveError; // 12 = save error
         // Clear the generated mnemonic from memory
         // Clear the generated mnemonic from memory
         mnemonic_clear();
         mnemonic_clear();
         model->mnemonic_only = true;
         model->mnemonic_only = true;
@@ -327,7 +329,8 @@ static int flipbip_scene_1_model_init(
     if(!flipbip_load_settings_secure(mnemonic)) return FlipBipStatusLoadError; // 11 = load error
     if(!flipbip_load_settings_secure(mnemonic)) return FlipBipStatusLoadError; // 11 = load error
     model->mnemonic = mnemonic;
     model->mnemonic = mnemonic;
     // Check if the mnemonic is valid
     // Check if the mnemonic is valid
-    if(mnemonic_check(model->mnemonic) == 0) return FlipBipStatusMnemonicCheckError; // 13 = mnemonic check error
+    if(mnemonic_check(model->mnemonic) == 0)
+        return FlipBipStatusMnemonicCheckError; // 13 = mnemonic check error
 
 
     // if we are only generating the mnemonic, return
     // if we are only generating the mnemonic, return
     if(model->mnemonic_only) {
     if(model->mnemonic_only) {
@@ -537,6 +540,7 @@ void flipbip_scene_1_enter(void* context) {
     }
     }
 
 
     flipbip_play_happy_bump(app);
     flipbip_play_happy_bump(app);
+    //notification_message(app->notification, &sequence_blink_cyan_100);
     flipbip_led_set_rgb(app, 255, 0, 0);
     flipbip_led_set_rgb(app, 255, 0, 0);
 
 
     with_view_model(
     with_view_model(
@@ -545,12 +549,8 @@ void flipbip_scene_1_enter(void* context) {
         {
         {
             // s_busy = true;
             // s_busy = true;
 
 
-            const int status = flipbip_scene_1_model_init(
-                model,
-                strength,
-                coin,
-                overwrite,
-                passphrase_text);
+            const int status =
+                flipbip_scene_1_model_init(model, strength, coin, overwrite, passphrase_text);
 
 
             // nonzero status, free the mnemonic
             // nonzero status, free the mnemonic
             if(status != FlipBipStatusSuccess) {
             if(status != FlipBipStatusSuccess) {