Merge pull request #29 from Next-Flip/js-backport-of-backport

Fixes for FW PR 270, more app updates
Next-Flip · Oct 19, 2024 · 14cdbee · 14cdbee
2 parents 36671ed + 2d045b7
commit 14cdbee
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 14 deletions.
diff --git a/seader/ccid.c b/seader/ccid.c
@@ -265,7 +265,7 @@ size_t seader_ccid_process(Seader* seader, uint8_t* cmd, size_t cmd_len) {
             FURI_LOG_W(
                 TAG,
                 "Invalid LRC.  Recv: %02x vs Calc: %02x",
-                cmd[2 + 10 + message.dwLength + 1],
+                cmd[2 + 10 + message.dwLength],
                 seader_calc_lrc(cmd, 2 + 10 + message.dwLength));
             // TODO: Should I respond with an error?
             return message.consumed;

diff --git a/seader/seader_worker.c b/seader/seader_worker.c
@@ -7,7 +7,7 @@
 
 #define APDU_HEADER_LEN 5
 #define ASN1_PREFIX     6
-#define ASN1_DEBUG      true
+// #define ASN1_DEBUG      true
 
 #define RFAL_PICOPASS_TXRX_FLAGS                                                    \
     (FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_TX_MANUAL | FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON | \
@@ -384,6 +384,10 @@ NfcCommand seader_worker_poller_callback_picopass(PicopassPollerEvent event, voi
             seader_worker_poller_conversation(seader, &spc);
         } else if(seader_worker->stage == SeaderPollerEventTypeComplete) {
             ret = NfcCommandStop;
+        } else if(seader_worker->stage == SeaderPollerEventTypeFail) {
+            view_dispatcher_send_custom_event(
+                seader->view_dispatcher, SeaderCustomEventWorkerExit);
+            ret = NfcCommandStop;
         }
     } else if(event.type == PicopassPollerEventTypeFail) {
         ret = NfcCommandStop;

diff --git a/totp/.gitsubtree b/totp/.gitsubtree
@@ -1,2 +1,2 @@
-https://github.com/xMasterX/all-the-plugins dev base_pack/totp 4558d74c9da36abc851edd96a95d18f7d5511a75
+https://github.com/xMasterX/all-the-plugins dev base_pack/totp d62ae7e4a951e348e43cb76e492173aedf4897ee
 https://github.com/akopachov/flipper-zero_authenticator master totp b147fbb3e9055fa8e119f69d4e9e84c0740b9d4e
diff --git a/totp/app_api_table_i.h b/totp/app_api_table_i.h
@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <cli/cli.h>
+#include <cli/cli_ansi.h>
 #include <lib/print/wrappers.h>
 #include <lib/toolbox/args.h>
 #include <memset_s.h>

diff --git a/totp/cli/cli.h b/totp/cli/cli.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cli/cli.h>
+#include <cli/cli_ansi.h>
 #include "../types/plugin_state.h"
 
 typedef struct TotpCliContext TotpCliContext;

diff --git a/totp/cli/cli_plugin_interface.h b/totp/cli/cli_plugin_interface.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cli/cli.h>
+#include <cli/cli_ansi.h>
 #include <furi/core/string.h>
 #include "../types/plugin_state.h"
 

diff --git a/totp/cli/cli_shared_methods.c b/totp/cli/cli_shared_methods.c
@@ -1,5 +1,6 @@
 #include "cli_shared_methods.h"
 #include <cli/cli.h>
+#include <cli/cli_ansi.h>
 #include <lib/toolbox/args.h>
 #include "cli_helpers.h"
 #include "../types/plugin_event.h"
@@ -35,13 +36,13 @@ void totp_cli_force_close_app(void* ctx) {
 bool totp_cli_read_line(Cli* cli, FuriString* out_str, bool mask_user_input) {
     uint8_t c;
     while(cli_read(cli, &c, 1) == 1) {
-        if(c == CliSymbolAsciiEsc) {
+        if(c == CliKeyEsc) {
             // Some keys generating escape-sequences
             // We need to ignore them as we care about alpha-numerics only
             uint8_t c2;
             cli_read_timeout(cli, &c2, 1, 0);
             cli_read_timeout(cli, &c2, 1, 0);
-        } else if(c == CliSymbolAsciiETX) {
+        } else if(c == CliKeyETX) {
             cli_nl(cli);
             return false;
         } else if(
@@ -54,13 +55,13 @@ bool totp_cli_read_line(Cli* cli, FuriString* out_str, bool mask_user_input) {
             }
             fflush(stdout);
             furi_string_push_back(out_str, c);
-        } else if(c == CliSymbolAsciiBackspace || c == CliSymbolAsciiDel) {
+        } else if(c == CliKeyBackspace || c == CliKeyDEL) {
             size_t out_str_size = furi_string_size(out_str);
             if(out_str_size > 0) {
                 TOTP_CLI_DELETE_LAST_CHAR();
                 furi_string_left(out_str, out_str_size - 1);
             }
-        } else if(c == CliSymbolAsciiCR) {
+        } else if(c == CliKeyCR) {
             cli_nl(cli);
             break;
         }

diff --git a/totp/cli/cli_shared_methods.h b/totp/cli/cli_shared_methods.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cli/cli.h>
+#include <cli/cli_ansi.h>
 #include "../types/plugin_state.h"
 
 #ifdef __cplusplus

diff --git a/totp/cli/plugins/delete/delete.c b/totp/cli/plugins/delete/delete.c
@@ -56,10 +56,10 @@ static void handle(PluginState* plugin_state, FuriString* args, Cli* cli) {
         char user_pick;
         do {
             user_pick = tolower(cli_getc(cli));
-        } while(user_pick != 'y' && user_pick != 'n' && user_pick != CliSymbolAsciiCR &&
-                user_pick != CliSymbolAsciiETX && user_pick != CliSymbolAsciiEsc);
+        } while(user_pick != 'y' && user_pick != 'n' && user_pick != CliKeyCR &&
+                user_pick != CliKeyETX && user_pick != CliKeyEsc);
 
-        confirmed = user_pick == 'y' || user_pick == CliSymbolAsciiCR;
+        confirmed = user_pick == 'y' || user_pick == CliKeyCR;
     }
 
     if(confirmed) {

diff --git a/totp/cli/plugins/pin/pin.c b/totp/cli/plugins/pin/pin.c
@@ -42,7 +42,7 @@ static bool totp_cli_read_pin(Cli* cli, uint8_t* pin, uint8_t* pin_length) {
     uint8_t c;
     *pin_length = 0;
     while(cli_read(cli, &c, 1) == 1) {
-        if(c == CliSymbolAsciiEsc) {
+        if(c == CliKeyEsc) {
             uint8_t c2;
             uint8_t c3;
             if(cli_read_timeout(cli, &c2, 1, 0) == 1 && cli_read_timeout(cli, &c3, 1, 0) == 1 &&
@@ -55,17 +55,17 @@ static bool totp_cli_read_pin(Cli* cli, uint8_t* pin, uint8_t* pin_length) {
                     fflush(stdout);
                 }
             }
-        } else if(c == CliSymbolAsciiETX) {
+        } else if(c == CliKeyETX) {
             TOTP_CLI_DELETE_CURRENT_LINE();
             TOTP_CLI_PRINTF_INFO("Cancelled by user\r\n");
             return false;
-        } else if(c == CliSymbolAsciiBackspace || c == CliSymbolAsciiDel) {
+        } else if(c == CliKeyBackspace || c == CliKeyDEL) {
             if(*pin_length > 0) {
                 *pin_length = *pin_length - 1;
                 pin[*pin_length] = 0;
                 TOTP_CLI_DELETE_LAST_CHAR();
             }
-        } else if(c == CliSymbolAsciiCR) {
+        } else if(c == CliKeyCR) {
             cli_nl(cli);
             break;
         }