mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 12:42:30 +04:00
fmt + update subbrute submodule
This commit is contained in:
@@ -41,7 +41,7 @@ typedef enum {
|
|||||||
DirectionLeft,
|
DirectionLeft,
|
||||||
} Direction;
|
} Direction;
|
||||||
|
|
||||||
#define MAX_SNAKE_LEN 128*64/4
|
#define MAX_SNAKE_LEN 128 * 64 / 4
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
Point points[MAX_SNAKE_LEN];
|
Point points[MAX_SNAKE_LEN];
|
||||||
@@ -268,7 +268,6 @@ static void
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
snake_state->currentMovement = snake_game_get_turn_snake(snake_state);
|
snake_state->currentMovement = snake_game_get_turn_snake(snake_state);
|
||||||
|
|
||||||
Point next_step = snake_game_get_next_step(snake_state);
|
Point next_step = snake_game_get_next_step(snake_state);
|
||||||
|
|||||||
Submodule applications/plugins/subbrute updated: 936023c8fb...ed49dcbfcd
@@ -90,7 +90,9 @@ void totp_scene_app_settings_render(Canvas* const canvas, PluginState* plugin_st
|
|||||||
scene_state->selected_control == ConfirmButton);
|
scene_state->selected_control == ConfirmButton);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool totp_scene_app_settings_handle_event(const PluginEvent* const event, PluginState* plugin_state) {
|
bool totp_scene_app_settings_handle_event(
|
||||||
|
const PluginEvent* const event,
|
||||||
|
PluginState* plugin_state) {
|
||||||
if(event->type == EventTypeKey) {
|
if(event->type == EventTypeKey) {
|
||||||
SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
|
SceneState* scene_state = (SceneState*)plugin_state->current_scene_state;
|
||||||
if(event->input.type == InputTypePress) {
|
if(event->input.type == InputTypePress) {
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ void totp_scene_app_settings_activate(
|
|||||||
PluginState* plugin_state,
|
PluginState* plugin_state,
|
||||||
const AppSettingsSceneContext* context);
|
const AppSettingsSceneContext* context);
|
||||||
void totp_scene_app_settings_render(Canvas* const canvas, PluginState* plugin_state);
|
void totp_scene_app_settings_render(Canvas* const canvas, PluginState* plugin_state);
|
||||||
bool totp_scene_app_settings_handle_event(const PluginEvent* const event, PluginState* plugin_state);
|
bool totp_scene_app_settings_handle_event(
|
||||||
|
const PluginEvent* const event,
|
||||||
|
PluginState* plugin_state);
|
||||||
void totp_scene_app_settings_deactivate(PluginState* plugin_state);
|
void totp_scene_app_settings_deactivate(PluginState* plugin_state);
|
||||||
void totp_scene_app_settings_free(const PluginState* plugin_state);
|
void totp_scene_app_settings_free(const PluginState* plugin_state);
|
||||||
@@ -73,7 +73,9 @@ void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_st
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool totp_scene_authenticate_handle_event(const PluginEvent* const event, PluginState* plugin_state) {
|
bool totp_scene_authenticate_handle_event(
|
||||||
|
const PluginEvent* const event,
|
||||||
|
PluginState* plugin_state) {
|
||||||
if(event->type == EventTypeKey) {
|
if(event->type == EventTypeKey) {
|
||||||
if(event->input.type == InputTypeLong && event->input.key == InputKeyBack) {
|
if(event->input.type == InputTypeLong && event->input.key == InputKeyBack) {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -9,6 +9,8 @@
|
|||||||
void totp_scene_authenticate_init(PluginState* plugin_state);
|
void totp_scene_authenticate_init(PluginState* plugin_state);
|
||||||
void totp_scene_authenticate_activate(PluginState* plugin_state);
|
void totp_scene_authenticate_activate(PluginState* plugin_state);
|
||||||
void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_state);
|
void totp_scene_authenticate_render(Canvas* const canvas, PluginState* plugin_state);
|
||||||
bool totp_scene_authenticate_handle_event(const PluginEvent* const event, PluginState* plugin_state);
|
bool totp_scene_authenticate_handle_event(
|
||||||
|
const PluginEvent* const event,
|
||||||
|
PluginState* plugin_state);
|
||||||
void totp_scene_authenticate_deactivate(PluginState* plugin_state);
|
void totp_scene_authenticate_deactivate(PluginState* plugin_state);
|
||||||
void totp_scene_authenticate_free(const PluginState* plugin_state);
|
void totp_scene_authenticate_free(const PluginState* plugin_state);
|
||||||
|
|||||||
@@ -5,7 +5,11 @@
|
|||||||
#define TEXT_BOX_HEIGHT 13
|
#define TEXT_BOX_HEIGHT 13
|
||||||
#define TEXT_BOX_MARGIN 4
|
#define TEXT_BOX_MARGIN 4
|
||||||
|
|
||||||
void ui_control_text_box_render(Canvas* const canvas, int16_t y, const char* text, bool is_selected) {
|
void ui_control_text_box_render(
|
||||||
|
Canvas* const canvas,
|
||||||
|
int16_t y,
|
||||||
|
const char* text,
|
||||||
|
bool is_selected) {
|
||||||
if(y < -TEXT_BOX_HEIGHT) {
|
if(y < -TEXT_BOX_HEIGHT) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,11 @@
|
|||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <gui/gui.h>
|
#include <gui/gui.h>
|
||||||
|
|
||||||
void ui_control_text_box_render(Canvas* const canvas, int16_t y, const char* text, bool is_selected);
|
void ui_control_text_box_render(
|
||||||
|
Canvas* const canvas,
|
||||||
|
int16_t y,
|
||||||
|
const char* text,
|
||||||
|
bool is_selected);
|
||||||
void ui_control_button_render(
|
void ui_control_button_render(
|
||||||
Canvas* const canvas,
|
Canvas* const canvas,
|
||||||
int16_t x,
|
int16_t x,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
static void render_callback(Canvas* const canvas, void* ctx) {
|
static void render_callback(Canvas* const canvas, void* ctx) {
|
||||||
PluginState* plugin_state = acquire_mutex((ValueMutex*)ctx, 25);
|
PluginState* plugin_state = acquire_mutex((ValueMutex*)ctx, 25);
|
||||||
if (plugin_state != NULL && !plugin_state->changing_scene) {
|
if(plugin_state != NULL && !plugin_state->changing_scene) {
|
||||||
totp_scene_director_render(canvas, plugin_state);
|
totp_scene_director_render(canvas, plugin_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,29 +49,43 @@ static bool totp_plugin_state_init(PluginState* const plugin_state) {
|
|||||||
|
|
||||||
totp_scene_director_init_scenes(plugin_state);
|
totp_scene_director_init_scenes(plugin_state);
|
||||||
|
|
||||||
if (plugin_state->crypto_verify_data == NULL) {
|
if(plugin_state->crypto_verify_data == NULL) {
|
||||||
DialogMessage* message = dialog_message_alloc();
|
DialogMessage* message = dialog_message_alloc();
|
||||||
dialog_message_set_buttons(message, "No", NULL, "Yes");
|
dialog_message_set_buttons(message, "No", NULL, "Yes");
|
||||||
dialog_message_set_text(message, "Would you like to setup PIN?", SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
|
dialog_message_set_text(
|
||||||
|
message,
|
||||||
|
"Would you like to setup PIN?",
|
||||||
|
SCREEN_WIDTH_CENTER,
|
||||||
|
SCREEN_HEIGHT_CENTER,
|
||||||
|
AlignCenter,
|
||||||
|
AlignCenter);
|
||||||
DialogMessageButton dialog_result = dialog_message_show(plugin_state->dialogs, message);
|
DialogMessageButton dialog_result = dialog_message_show(plugin_state->dialogs, message);
|
||||||
dialog_message_free(message);
|
dialog_message_free(message);
|
||||||
if (dialog_result == DialogMessageButtonRight) {
|
if(dialog_result == DialogMessageButtonRight) {
|
||||||
totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
|
totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
|
||||||
} else {
|
} else {
|
||||||
totp_crypto_seed_iv(plugin_state, NULL, 0);
|
totp_crypto_seed_iv(plugin_state, NULL, 0);
|
||||||
totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
|
totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
|
||||||
}
|
}
|
||||||
} else if (plugin_state->pin_set) {
|
} else if(plugin_state->pin_set) {
|
||||||
totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
|
totp_scene_director_activate_scene(plugin_state, TotpSceneAuthentication, NULL);
|
||||||
} else {
|
} else {
|
||||||
totp_crypto_seed_iv(plugin_state, NULL, 0);
|
totp_crypto_seed_iv(plugin_state, NULL, 0);
|
||||||
if (totp_crypto_verify_key(plugin_state)) {
|
if(totp_crypto_verify_key(plugin_state)) {
|
||||||
totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
|
totp_scene_director_activate_scene(plugin_state, TotpSceneGenerateToken, NULL);
|
||||||
} else {
|
} else {
|
||||||
FURI_LOG_E(LOGGING_TAG, "Digital signature verification failed. Looks like conf file was created on another flipper and can't be used on any other");
|
FURI_LOG_E(
|
||||||
|
LOGGING_TAG,
|
||||||
|
"Digital signature verification failed. Looks like conf file was created on another flipper and can't be used on any other");
|
||||||
DialogMessage* message = dialog_message_alloc();
|
DialogMessage* message = dialog_message_alloc();
|
||||||
dialog_message_set_buttons(message, "Exit", NULL, NULL);
|
dialog_message_set_buttons(message, "Exit", NULL, NULL);
|
||||||
dialog_message_set_text(message, "Digital signature verification failed", SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
|
dialog_message_set_text(
|
||||||
|
message,
|
||||||
|
"Digital signature verification failed",
|
||||||
|
SCREEN_WIDTH_CENTER,
|
||||||
|
SCREEN_HEIGHT_CENTER,
|
||||||
|
AlignCenter,
|
||||||
|
AlignCenter);
|
||||||
dialog_message_show(plugin_state->dialogs, message);
|
dialog_message_show(plugin_state->dialogs, message);
|
||||||
dialog_message_free(message);
|
dialog_message_free(message);
|
||||||
return false;
|
return false;
|
||||||
@@ -94,7 +108,7 @@ static void totp_plugin_state_free(PluginState* plugin_state) {
|
|||||||
|
|
||||||
ListNode* node = plugin_state->tokens_list;
|
ListNode* node = plugin_state->tokens_list;
|
||||||
ListNode* tmp;
|
ListNode* tmp;
|
||||||
while (node != NULL) {
|
while(node != NULL) {
|
||||||
tmp = node->next;
|
tmp = node->next;
|
||||||
TokenInfo* tokenInfo = node->data;
|
TokenInfo* tokenInfo = node->data;
|
||||||
token_info_free(tokenInfo);
|
token_info_free(tokenInfo);
|
||||||
@@ -102,7 +116,7 @@ static void totp_plugin_state_free(PluginState* plugin_state) {
|
|||||||
node = tmp;
|
node = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (plugin_state->crypto_verify_data != NULL) {
|
if(plugin_state->crypto_verify_data != NULL) {
|
||||||
free(plugin_state->crypto_verify_data);
|
free(plugin_state->crypto_verify_data);
|
||||||
}
|
}
|
||||||
free(plugin_state);
|
free(plugin_state);
|
||||||
@@ -112,7 +126,7 @@ int32_t totp_app() {
|
|||||||
FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
|
FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
|
||||||
PluginState* plugin_state = malloc(sizeof(PluginState));
|
PluginState* plugin_state = malloc(sizeof(PluginState));
|
||||||
|
|
||||||
if (!totp_plugin_state_init(plugin_state)) {
|
if(!totp_plugin_state_init(plugin_state)) {
|
||||||
FURI_LOG_E(LOGGING_TAG, "App state initialization failed\r\n");
|
FURI_LOG_E(LOGGING_TAG, "App state initialization failed\r\n");
|
||||||
totp_plugin_state_free(plugin_state);
|
totp_plugin_state_free(plugin_state);
|
||||||
return 254;
|
return 254;
|
||||||
@@ -137,18 +151,20 @@ int32_t totp_app() {
|
|||||||
bool processing = true;
|
bool processing = true;
|
||||||
uint32_t last_user_interaction_time = furi_get_tick();
|
uint32_t last_user_interaction_time = furi_get_tick();
|
||||||
while(processing) {
|
while(processing) {
|
||||||
if (plugin_state->changing_scene) continue;
|
if(plugin_state->changing_scene) continue;
|
||||||
FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
|
FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
|
||||||
|
|
||||||
PluginState* plugin_state_m = acquire_mutex_block(&state_mutex);
|
PluginState* plugin_state_m = acquire_mutex_block(&state_mutex);
|
||||||
|
|
||||||
if(event_status == FuriStatusOk) {
|
if(event_status == FuriStatusOk) {
|
||||||
if (event.type == EventTypeKey) {
|
if(event.type == EventTypeKey) {
|
||||||
last_user_interaction_time = furi_get_tick();
|
last_user_interaction_time = furi_get_tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
processing = totp_scene_director_handle_event(&event, plugin_state_m);
|
processing = totp_scene_director_handle_event(&event, plugin_state_m);
|
||||||
} else if (plugin_state_m->pin_set && plugin_state_m->current_scene != TotpSceneAuthentication && furi_get_tick() - last_user_interaction_time > IDLE_TIMEOUT) {
|
} else if(
|
||||||
|
plugin_state_m->pin_set && plugin_state_m->current_scene != TotpSceneAuthentication &&
|
||||||
|
furi_get_tick() - last_user_interaction_time > IDLE_TIMEOUT) {
|
||||||
totp_scene_director_activate_scene(plugin_state_m, TotpSceneAuthentication, NULL);
|
totp_scene_director_activate_scene(plugin_state_m, TotpSceneAuthentication, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user