From c4675afa5e93e2b8204acd792de0860380796bf4 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 27 Nov 2023 23:24:06 +0000
Subject: [PATCH 01/23] Fix evil portal html buffer overflow

---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index e2762e90d..8bfec3dfb 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit e2762e90dc1afa490f0de5fd3865de31ca8358ac
+Subproject commit 8bfec3dfb9213299af992f7ef693af7a73c705bb

From e0fa360640b4e8d3c1f419bec8c8425895bb11be Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 00:00:40 +0000
Subject: [PATCH 02/23] Fix rename/move API, now rename/rename_safe (#468)

On OFW "rename" acts like "move", it replaces the destination
XFW had an extra "move" like that, and "rename" errored if dest exists
Now for compatibility "rename" acts as OFW, and new "rename_safe" errors
Tweaked all usages to work properly
Decided for CLI and RPC to use "rename_safe" so user cant lose files
---
 .../main/archive/helpers/archive_favorites.c  | 24 +++++------
 .../main/archive/helpers/archive_files.c      |  2 +-
 applications/main/bad_kb/bad_kb_app.c         |  2 +-
 applications/services/rpc/rpc_storage.c       |  2 +-
 applications/services/storage/storage.h       | 13 +++---
 applications/services/storage/storage_cli.c   |  2 +-
 .../services/storage/storage_external_api.c   | 41 +++++++++----------
 furi/flipper.c                                |  6 +--
 targets/f7/api_symbols.csv                    |  2 +-
 9 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/applications/main/archive/helpers/archive_favorites.c b/applications/main/archive/helpers/archive_favorites.c
index db0700386..fad900e69 100644
--- a/applications/main/archive/helpers/archive_favorites.c
+++ b/applications/main/archive/helpers/archive_favorites.c
@@ -104,9 +104,9 @@ static bool archive_favourites_rescan() {
     furi_string_free(buffer);
 
     storage_file_close(file);
-    if(storage_common_move(storage, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH) == FSE_NOT_EXIST) {
-        storage_common_remove(storage, ARCHIVE_FAV_PATH);
-    }
+    storage_common_remove(storage, ARCHIVE_FAV_PATH);
+    storage_common_rename(storage, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
+    storage_common_remove(storage, ARCHIVE_FAV_TEMP_PATH);
 
     storage_file_free(file);
     furi_record_close(RECORD_STORAGE);
@@ -203,9 +203,9 @@ bool archive_favorites_delete(const char* format, ...) {
     furi_string_free(filename);
 
     storage_file_close(file);
-    if(storage_common_move(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH) == FSE_NOT_EXIST) {
-        storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
-    }
+    storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
+    storage_common_rename(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
+    storage_common_remove(fs_api, ARCHIVE_FAV_TEMP_PATH);
 
     storage_file_free(file);
     furi_record_close(RECORD_STORAGE);
@@ -282,9 +282,9 @@ bool archive_favorites_rename(const char* src, const char* dst) {
     furi_string_free(path);
 
     storage_file_close(file);
-    if(storage_common_move(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH) == FSE_NOT_EXIST) {
-        storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
-    }
+    storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
+    storage_common_rename(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
+    storage_common_remove(fs_api, ARCHIVE_FAV_TEMP_PATH);
 
     storage_file_free(file);
     furi_record_close(RECORD_STORAGE);
@@ -310,9 +310,9 @@ void archive_favorites_save(void* context) {
         archive_file_append(ARCHIVE_FAV_TEMP_PATH, "%s\n", furi_string_get_cstr(item->path));
     }
 
-    if(storage_common_move(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH) == FSE_NOT_EXIST) {
-        storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
-    }
+    storage_common_remove(fs_api, ARCHIVE_FAV_PATH);
+    storage_common_rename(fs_api, ARCHIVE_FAV_TEMP_PATH, ARCHIVE_FAV_PATH);
+    storage_common_remove(fs_api, ARCHIVE_FAV_TEMP_PATH);
 
     storage_file_free(file);
     furi_record_close(RECORD_STORAGE);
diff --git a/applications/main/archive/helpers/archive_files.c b/applications/main/archive/helpers/archive_files.c
index e839fc772..3e78c0d1b 100644
--- a/applications/main/archive/helpers/archive_files.c
+++ b/applications/main/archive/helpers/archive_files.c
@@ -178,7 +178,7 @@ FS_Error archive_copy_rename_file_or_dir(
         if(copy) {
             error = storage_common_copy(fs_api, src_path, furi_string_get_cstr(dst_path));
         } else {
-            error = storage_common_rename(fs_api, src_path, furi_string_get_cstr(dst_path));
+            error = storage_common_rename_safe(fs_api, src_path, furi_string_get_cstr(dst_path));
         }
     }
     furi_record_close(RECORD_STORAGE);
diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c
index 1c3156bcd..4ee226481 100644
--- a/applications/main/bad_kb/bad_kb_app.c
+++ b/applications/main/bad_kb/bad_kb_app.c
@@ -120,7 +120,7 @@ BadKbApp* bad_kb_app_alloc(char* arg) {
     }
 
     Storage* storage = furi_record_open(RECORD_STORAGE);
-    storage_common_rename(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER);
+    storage_common_rename_safe(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER);
     storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER);
     furi_record_close(RECORD_STORAGE);
 
diff --git a/applications/services/rpc/rpc_storage.c b/applications/services/rpc/rpc_storage.c
index 825e6df82..5fd232642 100644
--- a/applications/services/rpc/rpc_storage.c
+++ b/applications/services/rpc/rpc_storage.c
@@ -651,7 +651,7 @@ static void rpc_system_storage_rename_process(const PB_Main* request, void* cont
     Storage* fs_api = furi_record_open(RECORD_STORAGE);
 
     if(path_contains_only_ascii(request->content.storage_rename_request.new_path)) {
-        FS_Error error = storage_common_rename(
+        FS_Error error = storage_common_rename_safe(
             fs_api,
             request->content.storage_rename_request.old_path,
             request->content.storage_rename_request.new_path);
diff --git a/applications/services/storage/storage.h b/applications/services/storage/storage.h
index 7449b7c60..bcca46e30 100644
--- a/applications/services/storage/storage.h
+++ b/applications/services/storage/storage.h
@@ -312,6 +312,7 @@ FS_Error storage_common_remove(Storage* storage, const char* path);
  * @brief Rename a file or a directory.
  *
  * The file or the directory must NOT be open.
+ * Will overwrite the destination file if it already exists.
  *
  * Renaming a regular file to itself does nothing and always succeeds.
  * Renaming a directory to itself or to a subdirectory of itself always fails.
@@ -324,20 +325,20 @@ FS_Error storage_common_remove(Storage* storage, const char* path);
 FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path);
 
 /**
- * @brief Move a file or a directory.
+ * @brief Rename a file or a directory.
  *
  * The file or the directory must NOT be open.
- * Will overwrite the destination file if it already exists.
+ * Will error FSE_EXIST if the destination file already exists.
  *
- * Moving a regular file to itself does nothing and always succeeds.
- * Moving a directory to itself or to a subdirectory of itself always fails.
+ * Renaming a regular file to itself does nothing and always succeeds.
+ * Renaming a directory to itself or to a subdirectory of itself always fails.
  *
  * @param storage pointer to a storage API instance.
  * @param old_path pointer to a zero-terminated string containing the source path.
  * @param new_path pointer to a zero-terminated string containing the destination path.
- * @return FSE_OK if the file or directory has been successfully moved, any other error code on failure.
+ * @return FSE_OK if the file or directory has been successfully renamed, any other error code on failure.
  */
-FS_Error storage_common_move(Storage* storage, const char* old_path, const char* new_path);
+FS_Error storage_common_rename_safe(Storage* storage, const char* old_path, const char* new_path);
 
 /**
  * @brief Copy the file to a new location.
diff --git a/applications/services/storage/storage_cli.c b/applications/services/storage/storage_cli.c
index ae35d6bbb..209e77c39 100644
--- a/applications/services/storage/storage_cli.c
+++ b/applications/services/storage/storage_cli.c
@@ -454,7 +454,7 @@ static void storage_cli_rename(Cli* cli, FuriString* old_path, FuriString* args)
     if(!args_read_probably_quoted_string_and_trim(args, new_path)) {
         storage_cli_print_usage();
     } else {
-        FS_Error error = storage_common_rename(
+        FS_Error error = storage_common_rename_safe(
             api, furi_string_get_cstr(old_path), furi_string_get_cstr(new_path));
 
         if(error != FSE_OK) {
diff --git a/applications/services/storage/storage_external_api.c b/applications/services/storage/storage_external_api.c
index 8cdf78617..0c6ff2295 100644
--- a/applications/services/storage/storage_external_api.c
+++ b/applications/services/storage/storage_external_api.c
@@ -479,12 +479,13 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
             break;
         }
 
-        if(storage_common_exists(storage, new_path)) {
-            error = FSE_EXIST;
-            break;
-        }
-
         if(storage_dir_exists(storage, old_path)) {
+            // Cannot overwrite a file with a directory
+            if(storage_file_exists(storage, new_path)) {
+                error = FSE_INVALID_NAME;
+                break;
+            }
+
             // Cannot rename a directory to itself or to a nested directory
             if(storage_common_equivalent_path(storage, old_path, new_path, true)) {
                 error = FSE_INVALID_NAME;
@@ -497,6 +498,10 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
             break;
         }
 
+        if(storage_file_exists(storage, new_path)) {
+            storage_common_remove(storage, new_path);
+        }
+
         S_API_PROLOGUE;
         SAData data = {
             .rename = {
@@ -525,7 +530,7 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
     return error;
 }
 
-FS_Error storage_common_move(Storage* storage, const char* old_path, const char* new_path) {
+FS_Error storage_common_rename_safe(Storage* storage, const char* old_path, const char* new_path) {
     FS_Error error;
 
     do {
@@ -534,30 +539,24 @@ FS_Error storage_common_move(Storage* storage, const char* old_path, const char*
             break;
         }
 
-        if(storage_dir_exists(storage, old_path)) {
-            // Cannot overwrite a file with a directory
-            if(storage_file_exists(storage, new_path)) {
-                error = FSE_INVALID_NAME;
-                break;
-            }
+        if(storage_common_exists(storage, new_path)) {
+            error = FSE_EXIST;
+            break;
+        }
 
-            // Cannot move a directory to itself or to a nested directory
+        if(storage_dir_exists(storage, old_path)) {
+            // Cannot rename a directory to itself or to a nested directory
             if(storage_common_equivalent_path(storage, old_path, new_path, true)) {
                 error = FSE_INVALID_NAME;
                 break;
             }
 
-            // Moving a regular file to itself does nothing and always succeeds
+            // Renaming a regular file to itself does nothing and always succeeds
         } else if(storage_common_equivalent_path(storage, old_path, new_path, false)) {
             error = FSE_OK;
             break;
         }
 
-        if(storage_common_exists(storage, new_path)) {
-            error = storage_simply_remove_recursive(storage, new_path);
-            if(error != FSE_OK) break;
-        }
-
         S_API_PROLOGUE;
         SAData data = {
             .rename = {
@@ -756,7 +755,7 @@ static FS_Error
     if(error == FSE_OK) {
         if(file_info_is_dir(&fileinfo)) {
             if(!copy) {
-                error = storage_common_rename(storage, old_path, new_path);
+                error = storage_common_rename_safe(storage, old_path, new_path);
             }
             if(copy || error != FSE_OK) {
                 error = storage_merge_recursive(storage, old_path, new_path, copy);
@@ -814,7 +813,7 @@ static FS_Error
                 stream_free(stream_from);
                 stream_free(stream_to);
             } else {
-                error = storage_common_rename(storage, old_path, new_path_tmp);
+                error = storage_common_rename_safe(storage, old_path, new_path_tmp);
             }
         }
     }
diff --git a/furi/flipper.c b/furi/flipper.c
index 1ebaccdf1..0b33858fe 100644
--- a/furi/flipper.c
+++ b/furi/flipper.c
@@ -49,7 +49,7 @@ void flipper_migrate_files() {
     storage_common_remove(storage, INT_PATH(".passport.settings"));
     storage_common_remove(storage, INT_PATH(".region_data"));
 
-    // Migrate files
+    // Migrate files (use copy+remove to not overwrite dst but still delete src)
     FURI_LOG_I(TAG, "Migrate: Renames on external");
     storage_common_copy(storage, ARCHIVE_FAV_OLD_PATH, ARCHIVE_FAV_PATH);
     storage_common_remove(storage, ARCHIVE_FAV_OLD_PATH);
@@ -65,7 +65,7 @@ void flipper_migrate_files() {
     storage_common_remove(storage, POWER_SETTINGS_OLD_PATH);
     storage_common_copy(storage, BT_KEYS_STORAGE_OLD_PATH, BT_KEYS_STORAGE_PATH);
     storage_common_remove(storage, BT_KEYS_STORAGE_OLD_PATH);
-    storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH);
+    // storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH); // Not compatible anyway
     storage_common_remove(storage, NOTIFICATION_SETTINGS_OLD_PATH);
     // Ext -> Int
     FURI_LOG_I(TAG, "Migrate: External to Internal");
@@ -77,7 +77,7 @@ void flipper_migrate_files() {
     FileInfo file_info;
     if(storage_common_stat(storage, U2F_CNT_OLD_FILE, &file_info) == FSE_OK &&
        file_info.size > 200) { // Is on Int and has content
-        storage_common_move(storage, U2F_CNT_OLD_FILE, U2F_CNT_FILE); // Int -> Ext
+        storage_common_rename(storage, U2F_CNT_OLD_FILE, U2F_CNT_FILE); // Int -> Ext
     }
     storage_common_copy(storage, U2F_KEY_OLD_FILE, U2F_KEY_FILE); // Ext -> Int
 
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index cc083b2ec..7fc97ca09 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -2814,9 +2814,9 @@ Function,+,storage_common_fs_info,FS_Error,"Storage*, const char*, uint64_t*, ui
 Function,+,storage_common_merge,FS_Error,"Storage*, const char*, const char*"
 Function,+,storage_common_migrate,FS_Error,"Storage*, const char*, const char*"
 Function,+,storage_common_mkdir,FS_Error,"Storage*, const char*"
-Function,+,storage_common_move,FS_Error,"Storage*, const char*, const char*"
 Function,+,storage_common_remove,FS_Error,"Storage*, const char*"
 Function,+,storage_common_rename,FS_Error,"Storage*, const char*, const char*"
+Function,+,storage_common_rename_safe,FS_Error,"Storage*, const char*, const char*"
 Function,+,storage_common_resolve_path_and_ensure_app_directory,void,"Storage*, FuriString*"
 Function,+,storage_common_stat,FS_Error,"Storage*, const char*, FileInfo*"
 Function,+,storage_common_timestamp,FS_Error,"Storage*, const char*, uint32_t*"

From 4f8e80b0a4df41719df5c6a792ae105e1f918820 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 00:27:41 +0000
Subject: [PATCH 03/23] BadKB ask to migrate badusb folder + show loading

---
 applications/main/bad_kb/bad_kb_app.c         | 24 +++++++++++++----
 applications/main/bad_kb/bad_kb_app.h         |  5 +++-
 .../main/bad_kb/helpers/ducky_script.h        |  2 ++
 .../bad_kb/scenes/bad_kb_scene_file_select.c  | 26 +++++++++++++++++++
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c
index 4ee226481..d5a1ae27c 100644
--- a/applications/main/bad_kb/bad_kb_app.c
+++ b/applications/main/bad_kb/bad_kb_app.c
@@ -108,6 +108,17 @@ static void bad_kb_save_settings(BadKbApp* app) {
     furi_record_close(RECORD_STORAGE);
 }
 
+void bad_kb_app_show_loading_popup(BadKbApp* app, bool show) {
+    if(show) {
+        // Raise timer priority so that animations can play
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
+        view_dispatcher_switch_to_view(app->view_dispatcher, BadKbAppViewLoading);
+    } else {
+        // Restore default timer priority
+        furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
+    }
+}
+
 BadKbApp* bad_kb_app_alloc(char* arg) {
     BadKbApp* app = malloc(sizeof(BadKbApp));
 
@@ -119,11 +130,6 @@ BadKbApp* bad_kb_app_alloc(char* arg) {
         furi_string_set(app->file_path, arg);
     }
 
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    storage_common_rename_safe(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER);
-    storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER);
-    furi_record_close(RECORD_STORAGE);
-
     bad_kb_load_settings(app);
 
     app->gui = furi_record_open(RECORD_GUI);
@@ -184,6 +190,10 @@ BadKbApp* bad_kb_app_alloc(char* arg) {
     view_dispatcher_add_view(
         app->view_dispatcher, BadKbAppViewByteInput, byte_input_get_view(app->byte_input));
 
+    app->loading = loading_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, BadKbAppViewLoading, loading_get_view(app->loading));
+
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
     app->conn_mode = BadKbConnModeNone;
@@ -230,6 +240,10 @@ void bad_kb_app_free(BadKbApp* app) {
     view_dispatcher_remove_view(app->view_dispatcher, BadKbAppViewByteInput);
     byte_input_free(app->byte_input);
 
+    // Loading
+    view_dispatcher_remove_view(app->view_dispatcher, BadKbAppViewLoading);
+    loading_free(app->loading);
+
     // View dispatcher
     view_dispatcher_free(app->view_dispatcher);
     scene_manager_free(app->scene_manager);
diff --git a/applications/main/bad_kb/bad_kb_app.h b/applications/main/bad_kb/bad_kb_app.h
index e2786d301..08945b832 100644
--- a/applications/main/bad_kb/bad_kb_app.h
+++ b/applications/main/bad_kb/bad_kb_app.h
@@ -23,5 +23,8 @@ typedef enum {
     BadKbAppViewWork,
     BadKbAppViewVarItemList,
     BadKbAppViewByteInput,
-    BadKbAppViewTextInput
+    BadKbAppViewTextInput,
+    BadKbAppViewLoading,
 } BadKbAppView;
+
+void bad_kb_app_show_loading_popup(BadKbApp* app, bool show);
diff --git a/applications/main/bad_kb/helpers/ducky_script.h b/applications/main/bad_kb/helpers/ducky_script.h
index 7ed928efe..a4a3ef7b4 100644
--- a/applications/main/bad_kb/helpers/ducky_script.h
+++ b/applications/main/bad_kb/helpers/ducky_script.h
@@ -13,6 +13,7 @@ extern "C" {
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/text_input.h>
 #include <gui/modules/byte_input.h>
+#include <gui/modules/loading.h>
 #include "../views/bad_kb_view.h"
 #include "../bad_kb_paths.h"
 
@@ -137,6 +138,7 @@ struct BadKbApp {
     VariableItemList* var_item_list;
     TextInput* text_input;
     ByteInput* byte_input;
+    Loading* loading;
     char usb_name_buf[BAD_KB_USB_LEN];
     uint16_t usb_vidpid_buf[2];
     char bt_name_buf[BAD_KB_NAME_LEN];
diff --git a/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c b/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
index 635b4f318..3dd9f669c 100644
--- a/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
+++ b/applications/main/bad_kb/scenes/bad_kb_scene_file_select.c
@@ -6,6 +6,32 @@
 static bool bad_kb_file_select(BadKbApp* bad_kb) {
     furi_assert(bad_kb);
 
+    bad_kb_app_show_loading_popup(bad_kb, true);
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    if(storage_dir_exists(storage, EXT_PATH("badusb"))) {
+        DialogMessage* message = dialog_message_alloc();
+        dialog_message_set_header(message, "Migrate BadUSB?", 64, 0, AlignCenter, AlignTop);
+        dialog_message_set_buttons(message, "No", NULL, "Yes");
+        dialog_message_set_text(
+            message,
+            "A badusb folder was found!\n"
+            "XFW uses the badkb folder.\n"
+            "Want to transfer the files?",
+            64,
+            32,
+            AlignCenter,
+            AlignCenter);
+        DialogMessageButton res = dialog_message_show(furi_record_open(RECORD_DIALOGS), message);
+        dialog_message_free(message);
+        furi_record_close(RECORD_DIALOGS);
+        if(res == DialogMessageButtonRight) {
+            storage_common_migrate(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER);
+        }
+    }
+    storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER);
+    furi_record_close(RECORD_STORAGE);
+    bad_kb_app_show_loading_popup(bad_kb, false);
+
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(
         &browser_options, BAD_KB_APP_SCRIPT_EXTENSION, &I_badkb_10px);

From 721a3f997591b86938609bfea73ae96ac7a55208 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 00:30:14 +0000
Subject: [PATCH 04/23] Format

---
 .../nfc/helpers/protocol_support/st25tb/mykey.c   | 10 ++++------
 .../nfc/helpers/protocol_support/st25tb/mykey.h   |  6 ++++--
 .../protocol_support/st25tb/st25tb_render.c       | 15 +++++++++++----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/applications/main/nfc/helpers/protocol_support/st25tb/mykey.c b/applications/main/nfc/helpers/protocol_support/st25tb/mykey.c
index 5b75e10f2..61ac4e179 100644
--- a/applications/main/nfc/helpers/protocol_support/st25tb/mykey.c
+++ b/applications/main/nfc/helpers/protocol_support/st25tb/mykey.c
@@ -1,7 +1,7 @@
 #include "mykey.h"
 
 uint32_t encode_decode_block(uint32_t input) {
-        /*
+    /*
      * Swap all values using XOR
      * 32 bit: 1111222233334444
      */
@@ -14,13 +14,11 @@ uint32_t encode_decode_block(uint32_t input) {
     return input;
 }
 
-
-
-void endian_swap_uint8_array(uint8_t *array, size_t size) {
+void endian_swap_uint8_array(uint8_t* array, size_t size) {
     size_t i;
     uint8_t temp;
 
-    for (i = 0; i < size / 2; i++) {
+    for(i = 0; i < size / 2; i++) {
         temp = array[i];
         array[i] = array[size - 1 - i];
         array[size - 1 - i] = temp;
@@ -42,7 +40,7 @@ uint32_t get_block(uint32_t block) {
     return encode_decode_block(st25tb_get_block_value(block));
 }
 
-//decode for credit 
+//decode for credit
 uint32_t get_xored_block(uint32_t block, uint32_t key) {
     return encode_decode_block(st25tb_get_block_value(block) ^ key);
 }
\ No newline at end of file
diff --git a/applications/main/nfc/helpers/protocol_support/st25tb/mykey.h b/applications/main/nfc/helpers/protocol_support/st25tb/mykey.h
index 70d3d4403..bdd3da3e9 100644
--- a/applications/main/nfc/helpers/protocol_support/st25tb/mykey.h
+++ b/applications/main/nfc/helpers/protocol_support/st25tb/mykey.h
@@ -19,11 +19,13 @@ typedef enum {
 } LockIdStatus;
 
 #define get_uid(uid) ((uid)[7] | ((uid)[6] << 8) | ((uid)[5] << 16) | ((uid)[4] << 24))
-#define new_get_count_down_counter(b6) (~(b6 << 24 | (b6 & 0x0000FF00) << 8 | (b6 & 0x00FF0000) >> 8 | b6 >> 24))
+#define new_get_count_down_counter(b6) \
+    (~(b6 << 24 | (b6 & 0x0000FF00) << 8 | (b6 & 0x00FF0000) >> 8 | b6 >> 24))
 #define get_vendor(b1, b2) (get_block(b1) << 16 | (get_block(b2) & 0x0000FFFF))
 #define get_master_key(uid, vendor_id) ((uid) * ((vendor_id) + 1))
 #define get_is_bound(vendor_id) ((vendor_id) != MYKEY_DEFAULT_VENDOR_ID)
-#define get_encryption_key(master_key, count_down_counter)((master_key) * ((count_down_counter) + 1))
+#define get_encryption_key(master_key, count_down_counter) \
+    ((master_key) * ((count_down_counter) + 1))
 
 uint32_t encode_decode_block(uint32_t input);
 uint32_t st25tb_get_block_value(uint32_t block);
diff --git a/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c b/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c
index 7d6fa9eda..474c1ffe4 100644
--- a/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c
+++ b/applications/main/nfc/helpers/protocol_support/st25tb/st25tb_render.c
@@ -12,15 +12,18 @@ void nfc_render_st25tb_info(
     }
 
     uint32_t _uid = get_uid(data->uid);
-    uint32_t _count_down_counter_new = new_get_count_down_counter(st25tb_get_block_value(data->blocks[6]));
-    uint32_t _vendor_id = get_vendor(data->blocks[MYKEY_BLOCK_VENDOR_ID_1], data->blocks[MYKEY_BLOCK_VENDOR_ID_2]);
+    uint32_t _count_down_counter_new =
+        new_get_count_down_counter(st25tb_get_block_value(data->blocks[6]));
+    uint32_t _vendor_id =
+        get_vendor(data->blocks[MYKEY_BLOCK_VENDOR_ID_1], data->blocks[MYKEY_BLOCK_VENDOR_ID_2]);
     uint32_t _master_key = get_master_key(_uid, _vendor_id);
     uint32_t _encryption_key = get_encryption_key(_master_key, _count_down_counter_new);
     uint16_t credit = get_xored_block(data->blocks[MYKEY_BLOCK_CURRENT_CREDIT], _encryption_key);
     uint16_t _previous_credit = get_block(data->blocks[MYKEY_BLOCK_PREVIOUS_CREDIT]);
     bool _is_bound = get_is_bound(_vendor_id);
     furi_string_cat_printf(str, "\nCurrent Credit: %d.%02d E", credit / 100, credit % 100);
-    furi_string_cat_printf(str, "\nPrevius Credit: %d.%02d E", _previous_credit / 100, _previous_credit % 100);
+    furi_string_cat_printf(
+        str, "\nPrevius Credit: %d.%02d E", _previous_credit / 100, _previous_credit % 100);
     furi_string_cat_printf(str, "\nIs Bound: %s \n", _is_bound ? "Yes" : "No");
 
     if(format_type == NfcProtocolFormatTypeFull) {
@@ -34,7 +37,11 @@ void nfc_render_st25tb_info(
         furi_string_cat_printf(str, "\nBlocks:");
         for(size_t i = 0; i < st25tb_get_block_count(data->type); i += 2) {
             furi_string_cat_printf(
-                str, "\n %02X   %08lX  %08lX", i, st25tb_get_block_value(data->blocks[i]), st25tb_get_block_value(data->blocks[i + 1]));
+                str,
+                "\n %02X   %08lX  %08lX",
+                i,
+                st25tb_get_block_value(data->blocks[i]),
+                st25tb_get_block_value(data->blocks[i + 1]));
         }
     }
 }

From 2961c1b7ef19aeae80895449a9c41735180492e8 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 01:18:44 +0000
Subject: [PATCH 05/23] Minor app updates --nobuild

---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index 8bfec3dfb..71a31918e 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit 8bfec3dfb9213299af992f7ef693af7a73c705bb
+Subproject commit 71a31918ee834c9d2c3279a6794d4a8aa53c6cc1

From 1946aaf5e188c67ceef5efede0b46d7edf19825a Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 28 Nov 2023 04:21:43 +0300
Subject: [PATCH 06/23] upd discord notify

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 6bc9b3ebe..0e2314ad4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -341,7 +341,7 @@ steps:
       DISCORD_WEBHOOK:
         from_secret: dis_release_webhook
     commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
       - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
 
@@ -665,7 +665,7 @@ steps:
       DISCORD_WEBHOOK:
         from_secret: dis_dev_webhook
     commands:
-      - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
+      - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
       - ./discord.sh --text 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')'
 

From c4bf1fe71772af0fe4477c6a167a61516c08042b Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 28 Nov 2023 04:39:46 +0300
Subject: [PATCH 07/23] use char escaping

---
 .drone.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0e2314ad4..0a225e722 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -343,7 +343,8 @@ steps:
     commands:
       - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
-      - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
+      - echo 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/all-the-plugins/releases/latest)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version with only main apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'c.tgz&channel=release-cfw&version='${DRONE_TAG}'c)\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with RGB patch - only for hardware mod! - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz&channel=release-cfw&version='${DRONE_TAG}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'r.tgz)\n\n[-Version with Extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)' > messagedisc.txt 
+      - ./discord.sh --text "$(jq -Rs . <messagedisc.txt | cut -c 2- | rev | cut -c 2- | rev)"
 
   - name: "Send clean build to telegram"
     image: appleboy/drone-telegram
@@ -667,7 +668,8 @@ steps:
     commands:
       - wget "https://raw.githubusercontent.com/fieu/discord.sh/2253303efc0e7211ac2777d2535054cbb872f1e0/discord.sh"
       - chmod +x ./discord.sh
-      - ./discord.sh --text 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')'
+      - echo 'Unleashed firmware dev build successful!\n\nBuild - '${DRONE_BUILD_NUMBER}'\n\nCommit - https://github.com/DarkFlippers/unleashed-firmware/commit/'${DRONE_COMMIT_SHA}'\n\n[-> Sponsor our project](https://boosty.to/mmxdev)\n\n[-Version with Extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'e.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'e)\n\n[-Version with only main apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'c.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'c)\n\n[-Version with RGB patch - only for hardware mod! - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}'r)\n\n[-Version with RGB patch - only for hardware mod! - Direct download-](https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'r.tgz)\n\n[-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-'${DRONE_BUILD_NUMBER}'.tgz&channel=dev-cfw&version='${DRONE_BUILD_NUMBER}')' > messagedisc.txt
+      - ./discord.sh --text "$(jq -Rs . <messagedisc.txt | cut -c 2- | rev | cut -c 2- | rev)"
 
 trigger:
   branch:

From b7bfa8c36dc172b5a4f798828a695c5e20084000 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 02:37:05 +0000
Subject: [PATCH 08/23] Fix evil portal free()'s + more anim cycle times

---
 applications/external                                         | 2 +-
 .../xtreme_app/scenes/xtreme_app_scene_interface_graphics.c   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index 71a31918e..bb585dc99 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit 71a31918ee834c9d2c3279a6794d4a8aa53c6cc1
+Subproject commit bb585dc99844d96957f0ad78852437eca077ebe7
diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
index 0420af5f5..c3600ec43 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
@@ -66,8 +66,10 @@ static void xtreme_app_scene_interface_graphics_anim_speed_changed(VariableItem*
 const char* const cycle_anims_names[] = {
     "OFF",
     "Meta.txt",
+    "15 S",
     "30 S",
     "1 M",
+    "2 M",
     "5 M",
     "10 M",
     "15 M",
@@ -81,8 +83,10 @@ const char* const cycle_anims_names[] = {
 const int32_t cycle_anims_values[COUNT_OF(cycle_anims_names)] = {
     -1,
     0,
+    15,
     30,
     60,
+    120,
     300,
     600,
     900,

From 76a16af4236440d05ab5ab509793e9ee8078a0d7 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 03:13:03 +0000
Subject: [PATCH 09/23] Show anim errors, move credits to default pack

Remove fallback anim setting
Retry when anim manager resumes error anim
Always skip error anim when manager picks new anim
---
 .../xtreme_app_scene_interface_graphics.c      |  17 -----------------
 .../desktop/animations/animation_manager.c     |  15 +++++----------
 assets/dolphin/external/manifest.txt           |   7 +++++++
 .../thank_you_128x64/frame_0.png               | Bin
 .../thank_you_128x64/frame_1.png               | Bin
 .../thank_you_128x64/frame_2.png               | Bin
 .../thank_you_128x64/frame_3.png               | Bin
 .../thank_you_128x64/frame_4.png               | Bin
 .../thank_you_128x64/frame_5.png               | Bin
 .../thank_you_128x64/meta.txt                  |   0
 .../L1_AnimationError_128x64/frame_0.png       | Bin 0 -> 4975 bytes
 .../internal/L1_AnimationError_128x64/meta.txt |  14 ++++++++++++++
 assets/dolphin/internal/manifest.txt           |   2 +-
 lib/xtreme/settings.c                          |   6 ------
 lib/xtreme/xtreme.h                            |   1 -
 15 files changed, 27 insertions(+), 35 deletions(-)
 rename assets/dolphin/{internal => external}/thank_you_128x64/frame_0.png (100%)
 rename assets/dolphin/{internal => external}/thank_you_128x64/frame_1.png (100%)
 rename assets/dolphin/{internal => external}/thank_you_128x64/frame_2.png (100%)
 rename assets/dolphin/{internal => external}/thank_you_128x64/frame_3.png (100%)
 rename assets/dolphin/{internal => external}/thank_you_128x64/frame_4.png (100%)
 rename assets/dolphin/{internal => external}/thank_you_128x64/frame_5.png (100%)
 rename assets/dolphin/{internal => external}/thank_you_128x64/meta.txt (100%)
 create mode 100644 assets/dolphin/internal/L1_AnimationError_128x64/frame_0.png
 create mode 100644 assets/dolphin/internal/L1_AnimationError_128x64/meta.txt

diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
index c3600ec43..905445a3c 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
@@ -113,14 +113,6 @@ static void xtreme_app_scene_interface_graphics_unlock_anims_changed(VariableIte
     app->save_settings = true;
 }
 
-static void xtreme_app_scene_interface_graphics_fallback_anim_changed(VariableItem* item) {
-    XtremeApp* app = variable_item_get_context(item);
-    bool value = variable_item_get_current_value_index(item);
-    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
-    xtreme_settings.fallback_anim = value;
-    app->save_settings = true;
-}
-
 void xtreme_app_scene_interface_graphics_on_enter(void* context) {
     XtremeApp* app = context;
     VariableItemList* var_item_list = app->var_item_list;
@@ -171,15 +163,6 @@ void xtreme_app_scene_interface_graphics_on_enter(void* context) {
     variable_item_set_current_value_index(item, xtreme_settings.unlock_anims);
     variable_item_set_current_value_text(item, xtreme_settings.unlock_anims ? "ON" : "OFF");
 
-    item = variable_item_list_add(
-        var_item_list,
-        "Credits Anim",
-        2,
-        xtreme_app_scene_interface_graphics_fallback_anim_changed,
-        app);
-    variable_item_set_current_value_index(item, xtreme_settings.fallback_anim);
-    variable_item_set_current_value_text(item, xtreme_settings.fallback_anim ? "ON" : "OFF");
-
     variable_item_list_set_enter_callback(
         var_item_list, xtreme_app_scene_interface_graphics_var_item_list_callback, app);
 
diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index 042afb7d5..b46078931 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -17,7 +17,7 @@
 
 #define TAG "AnimationManager"
 
-#define HARDCODED_ANIMATION_NAME "thank_you_128x64"
+#define HARDCODED_ANIMATION_NAME "L1_AnimationError_128x64"
 #define NO_SD_ANIMATION_NAME "L1_NoSd_128x49"
 #define BAD_BATTERY_ANIMATION_NAME "L1_BadBattery_128x47"
 
@@ -388,21 +388,15 @@ static StorageAnimation*
     uint32_t whole_weight = 0;
 
     // Filter valid animations
-    bool fallback = xtreme_settings.fallback_anim;
     bool unlock = xtreme_settings.unlock_anims;
     StorageAnimationList_it_t it;
     for(StorageAnimationList_it(it, animation_list); !StorageAnimationList_end_p(it);) {
         StorageAnimation* storage_animation = *StorageAnimationList_ref(it);
         const StorageAnimationManifestInfo* manifest_info =
             animation_storage_get_meta(storage_animation);
-        bool valid = animation_manager_is_valid_idle_animation(manifest_info, &stats, unlock);
 
-        if(strcmp(manifest_info->name, HARDCODED_ANIMATION_NAME) == 0 && !fallback) {
-            // Skip fallback animation
-            valid = false;
-        }
-
-        if(valid) {
+        if(animation_manager_is_valid_idle_animation(manifest_info, &stats, unlock) &&
+           strcmp(manifest_info->name, HARDCODED_ANIMATION_NAME)) { // Dont pick error anim randomly
             StorageAnimationList_next(it);
         } else {
             animation_storage_free_storage_animation(&storage_animation);
@@ -543,7 +537,8 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
                     animation_storage_get_meta(restore_animation);
                 bool valid = animation_manager_is_valid_idle_animation(
                     manifest_info, &stats, xtreme_settings.unlock_anims);
-                if(valid) {
+                // Restore only if anim is valid and not the error anim
+                if(valid && strcmp(manifest_info->name, HARDCODED_ANIMATION_NAME) != 0) {
                     animation_manager_replace_current_animation(
                         animation_manager, restore_animation);
                     animation_manager->state = AnimationManagerStateIdle;
diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt
index 4921c5523..e2cc24b52 100644
--- a/assets/dolphin/external/manifest.txt
+++ b/assets/dolphin/external/manifest.txt
@@ -175,3 +175,10 @@ Max butthurt: 14
 Min level: 22
 Max level: 30
 Weight: 4
+
+Name: thank_you_128x64
+Min butthurt: 0
+Max butthurt: 14
+Min level: 6
+Max level: 30
+Weight: 1
diff --git a/assets/dolphin/internal/thank_you_128x64/frame_0.png b/assets/dolphin/external/thank_you_128x64/frame_0.png
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/frame_0.png
rename to assets/dolphin/external/thank_you_128x64/frame_0.png
diff --git a/assets/dolphin/internal/thank_you_128x64/frame_1.png b/assets/dolphin/external/thank_you_128x64/frame_1.png
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/frame_1.png
rename to assets/dolphin/external/thank_you_128x64/frame_1.png
diff --git a/assets/dolphin/internal/thank_you_128x64/frame_2.png b/assets/dolphin/external/thank_you_128x64/frame_2.png
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/frame_2.png
rename to assets/dolphin/external/thank_you_128x64/frame_2.png
diff --git a/assets/dolphin/internal/thank_you_128x64/frame_3.png b/assets/dolphin/external/thank_you_128x64/frame_3.png
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/frame_3.png
rename to assets/dolphin/external/thank_you_128x64/frame_3.png
diff --git a/assets/dolphin/internal/thank_you_128x64/frame_4.png b/assets/dolphin/external/thank_you_128x64/frame_4.png
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/frame_4.png
rename to assets/dolphin/external/thank_you_128x64/frame_4.png
diff --git a/assets/dolphin/internal/thank_you_128x64/frame_5.png b/assets/dolphin/external/thank_you_128x64/frame_5.png
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/frame_5.png
rename to assets/dolphin/external/thank_you_128x64/frame_5.png
diff --git a/assets/dolphin/internal/thank_you_128x64/meta.txt b/assets/dolphin/external/thank_you_128x64/meta.txt
similarity index 100%
rename from assets/dolphin/internal/thank_you_128x64/meta.txt
rename to assets/dolphin/external/thank_you_128x64/meta.txt
diff --git a/assets/dolphin/internal/L1_AnimationError_128x64/frame_0.png b/assets/dolphin/internal/L1_AnimationError_128x64/frame_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..5133056c2c2158e949c92f295d56e1a6e7f6af78
GIT binary patch
literal 4975
zcmeHLc~nzZ8h-&)#KN&H)&;3CprZJ)2a-q>N+Jn1z_80G`ttGu53-pA2vh_&#L<Ea
zf?IX0P^lt{C|X&R7LKW`#X(sGIdvFut7Au`j%Dr(d#C5j@to;@B<FI!ckg$9-}n9Q
zcRzC9?f^d@Tbp?{5Cqvu#KJ((r-J5bJr(?Ix|@;$x<)KqqL4_ILDt{_Xp*cT5|C0s
zBMr-*K(-)RLYAOU1MLGK6FNkjN19^p_X62rSk3~n%difyhC#A`Y(ak<G$xSkL4OuB
zeAkez3Lq07YxB1pNK-%?>3t;905X%xpi^0Fu%6Cj@fi$0lS`&E_-r<x!vyw8e;xCP
zKxz;-bOQf&;NIQ=5^ry^R;N+mN(_RG$CLL9#NP$j@AMDK`*PN_73l_3z>2jqXKni1
zGW%1X<j;zTqbELEz-BlvrDkl4t*ks*eRlhv;zGN^ZRFRMJ$*g7|DY_opJN|UWqj~r
zWqoPyPxq5k8}pfUee*2Yoo=kJa}U>CNIw<!^TNMCR#li{Zt;PvG);16(30l$+oA^g
z->!WdQz`TGbUuNk;U8Z3&|lRywKuuP+O=lc3*L)-$!zB>KVI*7;m~`a#-d^G;nv#u
zn|6dRkGt4ZS)h!mI#|UBxwCYGDX~Czzo#H1wjj>`*Kf668zOu7=UoEBZ&IAo0|LCK
zgtUko3lGW`diP2e3|@SkW6Ili&SG^&qSABwlV2(ayZe>rd#bMG*!x*@(lTB$EOx|i
zRdjBu$aFlDXkm47t84kwu4w4a$=rMG5l^h=v`nQIwjaGTZQV1-+doZtyU;#&k^P>V
zZ{{WkeLSaZN>W()H&^O6{Q}AH&_@p4-80j3Tt2Jo?G${We{=N==f(nFt#03mv_UVB
zgGM|!+z>APl#gmuR79?kVN|0^OKceAvC61L&{)hsmSIu2T0nVTdV@m7<pN3=M@pA!
zy|HLqoTS5olKg_vq*#<Er>t6O<6-0j02O9H$VQb?t>+sB6f-U#$iy&>LN==yVg;0N
zkVoDc9Y$tT*;G0#GUD+}%1Rruhfc2G2MSjYLx3j%CE8%n@@ce$gam2=i>lE@(HJ})
zk49(Gm`oUG!1_eB0WrdAy%Pa3gdxQAs1DZ}aE+QwU?MV2oIyaLfO+zWe=4n1Its7W
z53>OHpcxS@jX|Z;R4Ur|6?%gx9)Jux^t&tc!HHUo7KrIJaXJ(e#bauN(|8Et1dSpP
zAw}UTtvM(_-UMTEbW~3pr&F4B<R}eOVk!Wt2mUc8=o@gw7+Dj1BWBFujCTZ>8^xcX
zJrcWF8E8qRe4z%7BaBLf0t(?TU#>xMIe$oGaosqmoC~8Eiv_dYIqopR=3p>afiPuE
zI^xE{xZ|KCYP|tbqZk1Nz^ORE;qWjS%3w2Kg~E*ovoSUcMwnbS?C#E!F_;`V8$rfH
z`0H?xm56e@R|J$CK*_jFg*zAF0rMO;n2mB|Fv67qZ@4n1Oo6c66fD&24Y3b=uK<aF
z!lcs2Mgo+GL7~y91e8y4b)0c*A{bX;K?Z~%jp0sbFjyQekICcG*&NQ8QYfa=gM=e6
z%_Y)2BS-nG0U`nt2Uj6c7)`5=GEWfO!Uw?sVi6)w0kU}<#KQO1VTeJa3)X0q0?KIB
z9i5hf<0MB6h!8Pgz}jdX4j!q)u5>z|J`@)LC)LPtMdJU`CJqnT1L%V-7vp+hKhZoi
zbfSW=O+!yZk4oHpl*nZBq2MFvPzZV?9+R8>1Xx2;Xf&dZ!a(&HPS=rf{C84;t&qzV
z?sNrA=b;>!EyoxzkH^4ZIghPiGTkwZ%|j-l>op2P0;0pbq5zM8E0CV%|4?KX^A0YZ
zsGSgv5!(X@gBc8%$^9*1wBdkhM9mn9*n{?8oOqZO#uXW`ZfFb?FHj3<qs4HTGotML
zfuG^M_ya8f=t(2*#P1|slXSfk1Mj3fnO&1~y%PiPq&%5j|2Mj9#;#MC8vF`M0GB17
z>3BQ1Xib%^@e!J@T+o1bDe(qix>mea4?%WSL?az?wQ~T2(+m=+Xj<=#`K0CS;=1#x
z5M=qDMCcW4Y<qgVUHu(-rtqn0aIog*yg$L$!>De%8^nhw7LhkCOII{LX)ifs>+uoo
zE64&|=*h&Zgx?6SW9Em=UH0&KE#B3yeJk#))vsRFzxRGr{n71<toKzHcx7&RR-5yZ
zL-qXg&fbQ+tdxhn&vP#&&8n#Bi+_K`{_97Ie3O5uczk8x1;cZx$az=DnZiNp!M<qM
zW~Z<2EqRXls+U}vQ`ixb@pO&$M8~XkA?rU*{`&mW>`sz%+Gpotnp1Z#-`ME;4Vt&5
zuQ1JS-|^+N(8jjQe%I_Rg>N3UmQlzZ?$n(t=eca133;Ywm`Z=$W9{7fWTAt{tJigR
zOUf&f6lrYEjOaSe?v{Ip&*AvS<kvy2`Uq#`(ybBl=c1<U&-2^DGDS5jFJI4oo20xu
zr+8P)9Tbw<2x=}xlqNVz>koyB1P`(;=3GHqn=6WyCvWU&xo}JIudd?qf*FS&xL1Bl
zO}*A#X_c<@Kaf(Zj6Is7DneQvlTGZTy>aWZo;9R>kZw0j?R!m7sAR_Jp8Du^xZ$5|
zwZ2C(Pk8ytZu?$4z3Ti+y6f#5%WboA>$91$jrSc>)@-R4=dT^$I*DT6Hs<~qJ(zum
z)aNC-U6ym9nV0g)WZxPC;yc&maJs*zpj~>m40g1NxK;gr7-hOkSl6kBbf1$w^^r~+
zF1kaHZ!Y2&HJvi8FS@lp?1!9m(wD!UEp(M!YLXng{LrVpzbrq0^ZcSO9-%d5nc6Ah
z%GsiU4OcBaUQ~A-itvj=pFj;$1L;;KQUBb;=4Ca$rX$gB3QhmcI96UBpRr;w9yfj9
z^k!pkhoe(V@55J4;=r8Pl01i!h$Q^`y2!KVBxR8cSXVdubgfn|PA&P|C$}SeL(5MF
zQcX$jLSfkMg!ql$7iD*Tgmc?w<L)L?wNL!9BahloblZgn+2u5mE~k(yqiEvP^sL8M
zireZBg!^<r>MN_(R6J{4zW}z{zttny=I{MGT1Yo(`?f8dn8T^P-P3HVPe%r2E+$@@
OK@yRlu<(<O+x`Q7x)}KY

literal 0
HcmV?d00001

diff --git a/assets/dolphin/internal/L1_AnimationError_128x64/meta.txt b/assets/dolphin/internal/L1_AnimationError_128x64/meta.txt
new file mode 100644
index 000000000..bfac2e1fa
--- /dev/null
+++ b/assets/dolphin/internal/L1_AnimationError_128x64/meta.txt
@@ -0,0 +1,14 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 1
+Active frames: 0
+Frames order: 0
+Active cycles: 0
+Frame rate: 1
+Duration: 30
+Active cooldown: 0
+
+Bubble slots: 0
diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt
index 48dc597a8..e85c199eb 100644
--- a/assets/dolphin/internal/manifest.txt
+++ b/assets/dolphin/internal/manifest.txt
@@ -2,7 +2,7 @@ Filetype: Flipper Animation Manifest
 Version: 1
 
 # Animation 1
-Name: thank_you_128x64
+Name: L1_AnimationError_128x64
 Min butthurt: 0
 Max butthurt: 14
 Min level: 1
diff --git a/lib/xtreme/settings.c b/lib/xtreme/settings.c
index d178fae48..743eb12d2 100644
--- a/lib/xtreme/settings.c
+++ b/lib/xtreme/settings.c
@@ -10,7 +10,6 @@ XtremeSettings xtreme_settings = {
     .anim_speed = 100, // 100%
     .cycle_anims = 0, // Meta.txt
     .unlock_anims = false, // OFF
-    .fallback_anim = true, // ON
     .menu_style = MenuStyleWii, // Wii
     .lock_on_boot = false, // OFF
     .bad_pins_format = false, // OFF
@@ -69,10 +68,6 @@ void XTREME_SETTINGS_LOAD() {
             x->unlock_anims = b;
         }
         flipper_format_rewind(file);
-        if(flipper_format_read_bool(file, "fallback_anim", &b, 1)) {
-            x->fallback_anim = b;
-        }
-        flipper_format_rewind(file);
         if(flipper_format_read_uint32(file, "menu_style", &u, 1)) {
             x->menu_style = CLAMP(u, MenuStyleCount - 1U, 0U);
         }
@@ -209,7 +204,6 @@ void XTREME_SETTINGS_SAVE() {
         flipper_format_write_uint32(file, "anim_speed", &x->anim_speed, 1);
         flipper_format_write_int32(file, "cycle_anims", &x->cycle_anims, 1);
         flipper_format_write_bool(file, "unlock_anims", &x->unlock_anims, 1);
-        flipper_format_write_bool(file, "fallback_anim", &x->fallback_anim, 1);
         e = x->menu_style;
         flipper_format_write_uint32(file, "menu_style", &e, 1);
         flipper_format_write_bool(file, "bad_pins_format", &x->bad_pins_format, 1);
diff --git a/lib/xtreme/xtreme.h b/lib/xtreme/xtreme.h
index 47760797d..1c3977dbe 100644
--- a/lib/xtreme/xtreme.h
+++ b/lib/xtreme/xtreme.h
@@ -57,7 +57,6 @@ typedef struct {
     uint32_t anim_speed;
     int32_t cycle_anims;
     bool unlock_anims;
-    bool fallback_anim;
     MenuStyle menu_style;
     bool lock_on_boot;
     bool bad_pins_format;

From 707d87aadcb02f2a4685bb9d4a582a03e94a3471 Mon Sep 17 00:00:00 2001
From: Sil333033 <94360907+Sil333033@users.noreply.github.com>
Date: Tue, 28 Nov 2023 21:02:23 +0100
Subject: [PATCH 10/23] Add NFC Philips Sonicare parser --nobuild uwu :3

---
 applications/main/nfc/application.fam         |   9 ++
 .../nfc/plugins/supported_cards/sonicare.c    | 112 ++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 applications/main/nfc/plugins/supported_cards/sonicare.c

diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
index 8811063eb..e93a90183 100644
--- a/applications/main/nfc/application.fam
+++ b/applications/main/nfc/application.fam
@@ -109,6 +109,15 @@ App(
     sources=["plugins/supported_cards/kazan.c"],
 )
 
+App(
+    appid="sonicare_parser",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="sonicare_plugin_ep",
+    targets=["f7"],
+    requires=["nfc"],
+    sources=["plugins/supported_cards/sonicare.c"],
+)
+
 App(
     appid="nfc_start",
     targets=["f7"],
diff --git a/applications/main/nfc/plugins/supported_cards/sonicare.c b/applications/main/nfc/plugins/supported_cards/sonicare.c
new file mode 100644
index 000000000..5cd8080a5
--- /dev/null
+++ b/applications/main/nfc/plugins/supported_cards/sonicare.c
@@ -0,0 +1,112 @@
+// Parser for Philips Sonicare toothbrush heads.
+// Made by @Sil333033
+// Thanks to Cyrill Künzi for this research! https://kuenzi.dev/toothbrush/
+
+#include "nfc_supported_card_plugin.h"
+
+#include <flipper_application/flipper_application.h>
+#include <nfc/protocols/mf_ultralight/mf_ultralight.h>
+
+#define TAG "Sonicare"
+
+typedef enum {
+    SonicareHeadWhite,
+    SonicareHeadBlack,
+    SonicareHeadUnkown,
+} SonicareHead;
+
+static SonicareHead sonicare_get_head_type(const MfUltralightData* data) {
+    // data.page[34].data got 4 bytes
+    // 31:32:31:34 for black (not sure)
+    // 31:31:31:31 for white (not sure)
+    // the data should be in here based on the research, but i cant find it.
+    // page 34 byte 0 is always 0x30 for the white brushes i have, so i guess thats white
+    // TODO: Get a black brush and test this
+
+    if(data->page[34].data == 0x30) {
+        return SonicareHeadWhite;
+    } else {
+        return SonicareHeadUnkown;
+    }
+}
+
+static uint32_t sonicare_get_seconds_brushed(const MfUltralightData* data) {
+    uint32_t seconds_brushed = 0;
+
+    seconds_brushed += data->page[36].data[0];
+    seconds_brushed += data->page[36].data[1] << 8;
+
+    return seconds_brushed;
+}
+
+static bool sonicare_parse(const NfcDevice* device, FuriString* parsed_data) {
+    furi_assert(device);
+    furi_assert(parsed_data);
+
+    const MfUltralightData* data = nfc_device_get_data(device, NfcProtocolMfUltralight);
+
+    bool parsed = false;
+
+    do {
+        // string "philips" is stored in these pages
+        if(data->page[5].data[3] != 0x70 && data->page[6].data[0] != 0x68 &&
+           data->page[6].data[1] != 0x69 && data->page[6].data[2] != 0x6C &&
+           data->page[6].data[3] != 0x69 && data->page[7].data[0] != 0x70 &&
+           data->page[7].data[1] != 0x73) {
+            FURI_LOG_D(TAG, "Not a Philips Sonicare head");
+            break;
+        }
+
+        const SonicareHead head_type = sonicare_get_head_type(data);
+        const uint32_t seconds_brushed = sonicare_get_seconds_brushed(data);
+
+        FuriString* head_type_str = furi_string_alloc();
+
+        switch(head_type) {
+        case SonicareHeadWhite:
+            furi_string_printf(head_type_str, "White");
+            break;
+        case SonicareHeadBlack:
+            furi_string_printf(head_type_str, "Black");
+            break;
+        case SonicareHeadUnkown:
+        default:
+            furi_string_printf(head_type_str, "Unknown");
+            break;
+        }
+
+        furi_string_printf(
+            parsed_data,
+            "\e#Philips Sonicare head\nColor: %s\nTime brushed: %02.0f:%02.0f:%02ld\n",
+            furi_string_get_cstr(head_type_str),
+            floor(seconds_brushed / 3600),
+            floor((seconds_brushed / 60) % 60),
+            seconds_brushed % 60);
+
+        furi_string_free(head_type_str);
+
+        parsed = true;
+    } while(false);
+
+    return parsed;
+}
+
+/* Actual implementation of app<>plugin interface */
+static const NfcSupportedCardsPlugin sonicare_plugin = {
+    .protocol = NfcProtocolMfUltralight,
+    .verify = NULL,
+    .read = NULL,
+    .parse = sonicare_parse,
+};
+
+/* Plugin descriptor to comply with basic plugin specification */
+static const FlipperAppPluginDescriptor sonicare_plugin_descriptor = {
+    .appid = NFC_SUPPORTED_CARD_PLUGIN_APP_ID,
+    .ep_api_version = NFC_SUPPORTED_CARD_PLUGIN_API_VERSION,
+    .entry_point = &sonicare_plugin,
+};
+
+/* Plugin entry point - must return a pointer to const descriptor  */
+const FlipperAppPluginDescriptor* sonicare_plugin_ep() {
+    return &sonicare_plugin_descriptor;
+}

From 2dc9e1b873a2225a760cb2dc252a38d0efdedd37 Mon Sep 17 00:00:00 2001
From: Sil333033 <94360907+Sil333033@users.noreply.github.com>
Date: Tue, 28 Nov 2023 21:09:58 +0100
Subject: [PATCH 11/23] i forgor --nobuild

---
 applications/main/nfc/plugins/supported_cards/sonicare.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/main/nfc/plugins/supported_cards/sonicare.c b/applications/main/nfc/plugins/supported_cards/sonicare.c
index 5cd8080a5..66c5bdce5 100644
--- a/applications/main/nfc/plugins/supported_cards/sonicare.c
+++ b/applications/main/nfc/plugins/supported_cards/sonicare.c
@@ -23,7 +23,7 @@ static SonicareHead sonicare_get_head_type(const MfUltralightData* data) {
     // page 34 byte 0 is always 0x30 for the white brushes i have, so i guess thats white
     // TODO: Get a black brush and test this
 
-    if(data->page[34].data == 0x30) {
+    if(data->page[34].data[0] == 0x30) {
         return SonicareHeadWhite;
     } else {
         return SonicareHeadUnkown;

From 32f54632eaedb3da3efe2e8a2c488e43ded29192 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 28 Nov 2023 20:40:38 +0000
Subject: [PATCH 12/23] Refactor sonicare check --nobuild

---
 applications/main/nfc/plugins/supported_cards/sonicare.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/applications/main/nfc/plugins/supported_cards/sonicare.c b/applications/main/nfc/plugins/supported_cards/sonicare.c
index 66c5bdce5..a52a6589f 100644
--- a/applications/main/nfc/plugins/supported_cards/sonicare.c
+++ b/applications/main/nfc/plugins/supported_cards/sonicare.c
@@ -48,11 +48,10 @@ static bool sonicare_parse(const NfcDevice* device, FuriString* parsed_data) {
     bool parsed = false;
 
     do {
-        // string "philips" is stored in these pages
-        if(data->page[5].data[3] != 0x70 && data->page[6].data[0] != 0x68 &&
-           data->page[6].data[1] != 0x69 && data->page[6].data[2] != 0x6C &&
-           data->page[6].data[3] != 0x69 && data->page[7].data[0] != 0x70 &&
-           data->page[7].data[1] != 0x73) {
+        // Check for NDEF link match
+        const char* test = "philips.com/nfcbrushheadtap";
+        // Data is a array of arrays, cast to char array and compare
+        if(strncmp(test, (const char*)&data->page[5].data[3], strlen(test)) != 0) {
             FURI_LOG_D(TAG, "Not a Philips Sonicare head");
             break;
         }

From 30914678c99357f4eb8f73376d42d2ad8a71cf95 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 29 Nov 2023 00:20:15 +0300
Subject: [PATCH 13/23] ibutton FIX crash!!!

why??????
---
 applications/main/ibutton/scenes/ibutton_scene_write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/main/ibutton/scenes/ibutton_scene_write.c b/applications/main/ibutton/scenes/ibutton_scene_write.c
index 180f53e59..80bf13447 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_write.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_write.c
@@ -42,7 +42,7 @@ void ibutton_scene_write_on_enter(void* context) {
 
     furi_string_printf(
         tmp,
-        "[%s]\n%s",
+        "[%s]\n%s ",
         ibutton_protocols_get_name(ibutton->protocols, protocol_id),
         ibutton->key_name);
 

From 8628a2c6a2ffb9a32b4a83e4b7736a6bcd9bc924 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 29 Nov 2023 03:26:05 +0300
Subject: [PATCH 14/23] update changelog, release planned for next week

---
 CHANGELOG.md | 65 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc228c8da..dc6d5813b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,57 @@
+## Warning!!! Please read this before installing!!!
+**This release has some unresolved issues:**
+### Known NFC app regressions and issues: 
+- Mifare Classic with custom UID add manually option was temporarily removed (Unleashed)
+- Mifare Mini clones reading is broken (OFW)
+- Mifare Classic dict attack fast skip causes glitches/incorrect reading (OFW)
+- EMV simple data parser was removed with protocol with refactoring (OFW)
+### Some apps that was made for old nfc stack is now not compatible with the new API and require complete remake:
+**If you want to help with making this apps work again please send PR to the repo at link below**
+- Current list of affected apps: https://github.com/xMasterX/all-the-plugins/tree/dev/apps_broken_by_last_refactors
+- Also in app **Enhanced Sub-GHz Chat** - NFC part was temporarily removed to make app usable, NFC part of the app requires remaking it with new nfc stack
+**API was updated to v46.x** 
 ## New changes
-* SubGHz: Add 4 more systems to Add Manually (untested!)
-* SubGHz: Add Manually fixes
-* SubGHz: Added NiceFlor-S to ignore options, removed colons. (by @G2Dolphin | PR #620)
+* NFC: Added new parsers for transport cards - Umarsh, Kazan, Moscow, Metromoney(Tbilisi), and fixes for OFW parsers (by @assasinfil and @Leptopt1los) (special thanks for users who provided various dumps of those cards for research)
+* NFC: Added simple key name display to UI to fix regression
+* iButton: Fix UI text - protocol name getting out of screen bounds when key name is too large, and other related issues (by @krolchonok | PR #649)
+* SubGHz: Fixed feature naming in menu
+* SubGHz: Added honeywell protocol [(by @htotoo)](https://github.com/Flipper-XFW/Xtreme-Firmware/commit/ceee551befa0cb8fd8514a4f8a1250fd9e0997ee)
 * Misc code cleanup
-* RGB: Fix white color on reboot, move settings, add custom color option
-* **BLE Spam app** updated to latest version (Android, Windows support) (by @Willy-JL) -> (app can be found in builds ` `, `e`, `n`, `r`)
-* OFW: Fix double arrows and add proper indication
-* OFW: SubGHz: add manually fix 12-bits is 0xFFF (or 0xFF0) CAME/NICE 12-bit
-* OFW: Fix various crashes if debug libraries used 
+* Apps: **Bluetooth Remote / USB Keyboard & Mouse** - `Movie` and `PTT` modes by @hryamzik
+* Apps: **BLE Spam app** updated to latest version (New devices support, + Menu by holding Start) (by @Willy-JL) -> (app can be found in builds ` `, `e`, `n`, `r`)
+* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
+* OFW: Mifare Classic fixes
+* OFW: NFC: Felica UID emulation
+* OFW: 64k does not enough
+* OFW: fbt: improvements
+* OFW: Various Fixes for 0.95
+* OFW: Add Mastercode SubGHz Protocol
+* OFW: Do not remove file when renaming to itself
+* OFW: Fix iButton crash on missing file
+* OFW: NFC API improvements
+* OFW: MF Ultralight no pwd polling adjustment
+* OFW: Fix limited_credit_value having wrong value in mf_desfire_file_settings_parse
+* OFW: Infrared remote button index support
+* OFW: Fix NFC unit tests
+* OFW: fix: invariant format of log time data
+* OFW: fbt: dist improvements
+* OFW: Fix crash when exiting write mode
+* OFW: Dolphin: Extreme butthurt loop fix
+* OFW: **Furi, FuriHal: remove FreeRTOS headers leaks**
+* OFW: fbt: source collection improvements
+* OFW: Rename menu items related to dummy mode and sound
+* OFW: fbt: SD card resource handling speedup
+* OFW: **Furi: cleanup crash use**
+* OFW: Allow for larger Infrared remotes 
+* OFW: **fbt: reworked assets & resources handling**
+* OFW: Storage: speedup write_chunk cli command
+* OFW: fix crash after st25tb save
+* OFW: Fix crash when reading files > 64B
+* OFW: NFC RC fixes
+* OFW: Fix MF DESFire record file handling
+* OFW: **NFC refactoring** (new NFC stack) -> some apps still require very big changes to make them work with new system - see apps that was temporarily removed from this release here: https://github.com/xMasterX/all-the-plugins/tree/dev/apps_broken_by_last_refactors
+* OFW: fbt: glob & git improvements
+* OFW: FastFAP: human readable error log 
 
 ----
 
@@ -31,7 +75,8 @@
 |XMR|(Monero)| `41xUz92suUu1u5Mu4qkrcs52gtfpu9rnZRdBpCJ244KRHf6xXSvVFevdf2cnjS7RAeYr5hn9MsEfxKoFDRSctFjG5fv1Mhn`|
 |TON||`EQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmpGf`|
 
-#### Thanks to our sponsors:
+#### Thanks to our sponsors who supported project in the past and special thanks to sponsors who supports us on regular basis:
+Pathfinder [Count Zero cDc], 
 callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
 and all other great people who supported our project and me (xMasterX), thanks to you all!
 
@@ -50,7 +95,7 @@ What build I should download and what this name means - `flipper-z-f7-update-(ve
 | `c` | ✅ |  |  |  |
 | `n` |  | ✅ |  |  |
 | `e` | ✅ | ✅ | ✅ |  |
-| `r` | ✅ | ✅ | ✅ | ✅ |
+| `r` | ✅ | ✅ | ✅ | ⚠️ |
 
 ⚠️This is [hardware mod](https://github.com/quen0n/flipperzero-firmware-rgb#readme), works only on modded flippers! do not install on non modded device!
 

From df3bc84929ed747a81f49e8527d81631a27d3b06 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 05:08:23 +0000
Subject: [PATCH 15/23] BleSpam: Apple colors! Idea + colors by @xAstroBoy

Co-Authored-By: xAstroBoy <xAstroBoy@users.noreply.github.com>
---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index bb585dc99..cc9bd4f4a 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit bb585dc99844d96957f0ad78852437eca077ebe7
+Subproject commit cc9bd4f4ad01a028dad040ddf5fd458cbc312e5d

From 23bc24005fde6c91f25bf72a68b01b237996eba2 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 06:00:15 +0000
Subject: [PATCH 16/23] Fix color menu with model bruteforce --nobuild

---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index cc9bd4f4a..521a58201 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit cc9bd4f4ad01a028dad040ddf5fd458cbc312e5d
+Subproject commit 521a58201a2e90f509cd156ebd0ddf7c89fe2ffd

From cdbcc90a8aa65e898eed4a0ec35daeb0b830cbac Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 06:06:55 +0000
Subject: [PATCH 17/23] Fix callback too

---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index 521a58201..85752c412 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit 521a58201a2e90f509cd156ebd0ddf7c89fe2ffd
+Subproject commit 85752c412a45cc909dd9282fde631d7843546d54

From 466e1f989f5c320675facbfde099d0cc5e53071a Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:51:26 +0000
Subject: [PATCH 18/23] New variable_item_list_get() API

---
 .../services/gui/modules/variable_item_list.c   | 17 +++++++++++++++++
 .../services/gui/modules/variable_item_list.h   |  9 +++++++++
 targets/f7/api_symbols.csv                      |  1 +
 3 files changed, 27 insertions(+)

diff --git a/applications/services/gui/modules/variable_item_list.c b/applications/services/gui/modules/variable_item_list.c
index 736fe0975..25e4f39fe 100644
--- a/applications/services/gui/modules/variable_item_list.c
+++ b/applications/services/gui/modules/variable_item_list.c
@@ -543,6 +543,23 @@ VariableItem* variable_item_list_add(
     return item;
 }
 
+VariableItem* variable_item_list_get(VariableItemList* variable_item_list, uint8_t position) {
+    VariableItem* item = NULL;
+    furi_assert(variable_item_list);
+
+    with_view_model(
+        variable_item_list->view,
+        VariableItemListModel * model,
+        {
+            if(position < VariableItemArray_size(model->items)) {
+                item = VariableItemArray_get(model->items, position);
+            }
+        },
+        true);
+
+    return item;
+}
+
 void variable_item_list_set_enter_callback(
     VariableItemList* variable_item_list,
     VariableItemListEnterCallback callback,
diff --git a/applications/services/gui/modules/variable_item_list.h b/applications/services/gui/modules/variable_item_list.h
index 4079e5a5f..c5bb3628b 100644
--- a/applications/services/gui/modules/variable_item_list.h
+++ b/applications/services/gui/modules/variable_item_list.h
@@ -59,6 +59,15 @@ VariableItem* variable_item_list_add(
     VariableItemChangeCallback change_callback,
     void* context);
 
+/** Get item in VariableItemList
+ *
+ * @param      variable_item_list  VariableItemList instance
+ * @param      position            index of the item to get
+ *
+ * @return     VariableItem* item instance
+ */
+VariableItem* variable_item_list_get(VariableItemList* variable_item_list, uint8_t position);
+
 /** Set enter callback
  *
  * @param      variable_item_list  VariableItemList instance
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 7fc97ca09..1c7a8f8b4 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -3239,6 +3239,7 @@ Function,+,variable_item_get_current_value_index,uint8_t,VariableItem*
 Function,+,variable_item_list_add,VariableItem*,"VariableItemList*, const char*, uint8_t, VariableItemChangeCallback, void*"
 Function,+,variable_item_list_alloc,VariableItemList*,
 Function,+,variable_item_list_free,void,VariableItemList*
+Function,+,variable_item_list_get,VariableItem*,"VariableItemList*, uint8_t"
 Function,+,variable_item_list_get_selected_item_index,uint8_t,VariableItemList*
 Function,+,variable_item_list_get_view,View*,VariableItemList*
 Function,+,variable_item_list_reset,void,VariableItemList*

From 0d3a12c00dea8c5071a7e9f60ddf1118047317b9 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:52:31 +0000
Subject: [PATCH 19/23] Add back option to disable credits for base pack

---
 .../xtreme_app_scene_interface_graphics.c     |  24 +++++++++++++++++-
 .../desktop/animations/animation_manager.c    |  14 ++++++++--
 .../frame_0.png                               | Bin
 .../frame_1.png                               | Bin
 .../frame_2.png                               | Bin
 .../frame_3.png                               | Bin
 .../frame_4.png                               | Bin
 .../frame_5.png                               | Bin
 .../meta.txt                                  |   0
 assets/dolphin/external/manifest.txt          |   2 +-
 lib/xtreme/settings.c                         |   6 +++++
 lib/xtreme/xtreme.h                           |   1 +
 12 files changed, 43 insertions(+), 4 deletions(-)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/frame_0.png (100%)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/frame_1.png (100%)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/frame_2.png (100%)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/frame_3.png (100%)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/frame_4.png (100%)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/frame_5.png (100%)
 rename assets/dolphin/external/{thank_you_128x64 => Credits_128x64}/meta.txt (100%)

diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
index 905445a3c..f0f77b9f5 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_graphics.c
@@ -5,7 +5,7 @@ enum VarItemListIndex {
     VarItemListIndexAnimSpeed,
     VarItemListIndexCycleAnims,
     VarItemListIndexUnlockAnims,
-    VarItemListIndexFallbackAnim,
+    VarItemListIndexCreditsAnim,
 };
 
 void xtreme_app_scene_interface_graphics_var_item_list_callback(void* context, uint32_t index) {
@@ -18,6 +18,10 @@ static void xtreme_app_scene_interface_graphics_asset_pack_changed(VariableItem*
     uint8_t index = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(
         item, index == 0 ? "Default" : *CharList_get(app->asset_pack_names, index - 1));
+    variable_item_set_locked(
+        variable_item_list_get(app->var_item_list, VarItemListIndexCreditsAnim),
+        index != 0,
+        "Credits\nare in\ndefault pack!");
     strlcpy(
         xtreme_settings.asset_pack,
         index == 0 ? "" : *CharList_get(app->asset_pack_names, index - 1),
@@ -113,6 +117,14 @@ static void xtreme_app_scene_interface_graphics_unlock_anims_changed(VariableIte
     app->save_settings = true;
 }
 
+static void xtreme_app_scene_interface_graphics_credits_anim_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
+    bool value = variable_item_get_current_value_index(item);
+    variable_item_set_current_value_text(item, value ? "ON" : "OFF");
+    xtreme_settings.credits_anim = value;
+    app->save_settings = true;
+}
+
 void xtreme_app_scene_interface_graphics_on_enter(void* context) {
     XtremeApp* app = context;
     VariableItemList* var_item_list = app->var_item_list;
@@ -163,6 +175,16 @@ void xtreme_app_scene_interface_graphics_on_enter(void* context) {
     variable_item_set_current_value_index(item, xtreme_settings.unlock_anims);
     variable_item_set_current_value_text(item, xtreme_settings.unlock_anims ? "ON" : "OFF");
 
+    item = variable_item_list_add(
+        var_item_list,
+        "Credits Anim",
+        2,
+        xtreme_app_scene_interface_graphics_credits_anim_changed,
+        app);
+    variable_item_set_current_value_index(item, xtreme_settings.credits_anim);
+    variable_item_set_current_value_text(item, xtreme_settings.credits_anim ? "ON" : "OFF");
+    variable_item_set_locked(item, app->asset_pack_index != 0, "Credits\nare in\ndefault pack!");
+
     variable_item_list_set_enter_callback(
         var_item_list, xtreme_app_scene_interface_graphics_var_item_list_callback, app);
 
diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index b46078931..a4e4558c2 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -20,6 +20,7 @@
 #define HARDCODED_ANIMATION_NAME "L1_AnimationError_128x64"
 #define NO_SD_ANIMATION_NAME "L1_NoSd_128x49"
 #define BAD_BATTERY_ANIMATION_NAME "L1_BadBattery_128x47"
+#define CREDITS_ANIMATION_NAME "Credits_128x64"
 
 #define NO_DB_ANIMATION_NAME "L0_NoDb_128x51"
 #define BAD_SD_ANIMATION_NAME "L0_SdBad_128x51"
@@ -388,15 +389,24 @@ static StorageAnimation*
     uint32_t whole_weight = 0;
 
     // Filter valid animations
+    bool skip_credits = !xtreme_settings.credits_anim && xtreme_settings.asset_pack[0] == '\0';
     bool unlock = xtreme_settings.unlock_anims;
     StorageAnimationList_it_t it;
     for(StorageAnimationList_it(it, animation_list); !StorageAnimationList_end_p(it);) {
         StorageAnimation* storage_animation = *StorageAnimationList_ref(it);
         const StorageAnimationManifestInfo* manifest_info =
             animation_storage_get_meta(storage_animation);
+        bool valid = animation_manager_is_valid_idle_animation(manifest_info, &stats, unlock);
 
-        if(animation_manager_is_valid_idle_animation(manifest_info, &stats, unlock) &&
-           strcmp(manifest_info->name, HARDCODED_ANIMATION_NAME)) { // Dont pick error anim randomly
+        if(strcmp(manifest_info->name, HARDCODED_ANIMATION_NAME) == 0) {
+            // Dont pick error anim randomly
+            valid = false;
+        } else if(skip_credits && strcmp(manifest_info->name, CREDITS_ANIMATION_NAME) == 0) {
+            // Dont pick credits anim if disabled
+            valid = false;
+        }
+
+        if(valid) { // Dont pick error anim randomly
             StorageAnimationList_next(it);
         } else {
             animation_storage_free_storage_animation(&storage_animation);
diff --git a/assets/dolphin/external/thank_you_128x64/frame_0.png b/assets/dolphin/external/Credits_128x64/frame_0.png
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/frame_0.png
rename to assets/dolphin/external/Credits_128x64/frame_0.png
diff --git a/assets/dolphin/external/thank_you_128x64/frame_1.png b/assets/dolphin/external/Credits_128x64/frame_1.png
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/frame_1.png
rename to assets/dolphin/external/Credits_128x64/frame_1.png
diff --git a/assets/dolphin/external/thank_you_128x64/frame_2.png b/assets/dolphin/external/Credits_128x64/frame_2.png
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/frame_2.png
rename to assets/dolphin/external/Credits_128x64/frame_2.png
diff --git a/assets/dolphin/external/thank_you_128x64/frame_3.png b/assets/dolphin/external/Credits_128x64/frame_3.png
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/frame_3.png
rename to assets/dolphin/external/Credits_128x64/frame_3.png
diff --git a/assets/dolphin/external/thank_you_128x64/frame_4.png b/assets/dolphin/external/Credits_128x64/frame_4.png
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/frame_4.png
rename to assets/dolphin/external/Credits_128x64/frame_4.png
diff --git a/assets/dolphin/external/thank_you_128x64/frame_5.png b/assets/dolphin/external/Credits_128x64/frame_5.png
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/frame_5.png
rename to assets/dolphin/external/Credits_128x64/frame_5.png
diff --git a/assets/dolphin/external/thank_you_128x64/meta.txt b/assets/dolphin/external/Credits_128x64/meta.txt
similarity index 100%
rename from assets/dolphin/external/thank_you_128x64/meta.txt
rename to assets/dolphin/external/Credits_128x64/meta.txt
diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt
index e2cc24b52..fc4d112fe 100644
--- a/assets/dolphin/external/manifest.txt
+++ b/assets/dolphin/external/manifest.txt
@@ -176,7 +176,7 @@ Min level: 22
 Max level: 30
 Weight: 4
 
-Name: thank_you_128x64
+Name: Credits_128x64
 Min butthurt: 0
 Max butthurt: 14
 Min level: 6
diff --git a/lib/xtreme/settings.c b/lib/xtreme/settings.c
index 743eb12d2..b4d5b652e 100644
--- a/lib/xtreme/settings.c
+++ b/lib/xtreme/settings.c
@@ -10,6 +10,7 @@ XtremeSettings xtreme_settings = {
     .anim_speed = 100, // 100%
     .cycle_anims = 0, // Meta.txt
     .unlock_anims = false, // OFF
+    .credits_anim = true, // ON
     .menu_style = MenuStyleWii, // Wii
     .lock_on_boot = false, // OFF
     .bad_pins_format = false, // OFF
@@ -68,6 +69,10 @@ void XTREME_SETTINGS_LOAD() {
             x->unlock_anims = b;
         }
         flipper_format_rewind(file);
+        if(flipper_format_read_bool(file, "credits_anim", &b, 1)) {
+            x->credits_anim = b;
+        }
+        flipper_format_rewind(file);
         if(flipper_format_read_uint32(file, "menu_style", &u, 1)) {
             x->menu_style = CLAMP(u, MenuStyleCount - 1U, 0U);
         }
@@ -204,6 +209,7 @@ void XTREME_SETTINGS_SAVE() {
         flipper_format_write_uint32(file, "anim_speed", &x->anim_speed, 1);
         flipper_format_write_int32(file, "cycle_anims", &x->cycle_anims, 1);
         flipper_format_write_bool(file, "unlock_anims", &x->unlock_anims, 1);
+        flipper_format_write_bool(file, "credits_anim", &x->credits_anim, 1);
         e = x->menu_style;
         flipper_format_write_uint32(file, "menu_style", &e, 1);
         flipper_format_write_bool(file, "bad_pins_format", &x->bad_pins_format, 1);
diff --git a/lib/xtreme/xtreme.h b/lib/xtreme/xtreme.h
index 1c3977dbe..f8b0e8761 100644
--- a/lib/xtreme/xtreme.h
+++ b/lib/xtreme/xtreme.h
@@ -57,6 +57,7 @@ typedef struct {
     uint32_t anim_speed;
     int32_t cycle_anims;
     bool unlock_anims;
+    bool credits_anim;
     MenuStyle menu_style;
     bool lock_on_boot;
     bool bad_pins_format;

From f47332e79953796aff0835a5f1f78fe2de78f0f7 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:31:57 +0000
Subject: [PATCH 20/23] BleSpam UI improvements and manual send MAC fix

---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index 85752c412..ed832168a 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit 85752c412a45cc909dd9282fde631d7843546d54
+Subproject commit ed832168a762fb50fd12909530fd433559daa504

From ab46739d3888ae349eaedc570198364401d73b0f Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:11:49 +0000
Subject: [PATCH 21/23] Refresh UIs without scene shenanigans

---
 .../xtreme_app_scene_interface_mainmenu.c     | 22 +++++++--
 .../scenes/xtreme_app_scene_misc_screen.c     | 46 ++++++++++++++-----
 .../xtreme_app_scene_protocols_freqs_hopper.c | 20 +++++++-
 .../xtreme_app_scene_protocols_freqs_static.c | 20 +++++++-
 4 files changed, 88 insertions(+), 20 deletions(-)

diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c
index d9f973790..da3ab1040 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu.c
@@ -139,14 +139,28 @@ bool xtreme_app_scene_interface_mainmenu_on_event(void* context, SceneManagerEve
                 app->mainmenu_app_labels, app->mainmenu_app_index, app->mainmenu_app_index + 1);
             CharList_remove_v(
                 app->mainmenu_app_exes, app->mainmenu_app_index, app->mainmenu_app_index + 1);
-            if(app->mainmenu_app_index) app->mainmenu_app_index--;
             /* fall through */
-        case VarItemListIndexMoveApp:
+        case VarItemListIndexMoveApp: {
             app->save_mainmenu_apps = true;
             app->require_reboot = true;
-            scene_manager_previous_scene(app->scene_manager);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceMainmenu);
+            size_t count = CharList_size(app->mainmenu_app_labels);
+            VariableItem* item = variable_item_list_get(app->var_item_list, VarItemListIndexApp);
+            if(count) {
+                app->mainmenu_app_index = CLAMP(app->mainmenu_app_index, count - 1, 0U);
+                char label[20];
+                snprintf(label, 20, "App  %u/%u", 1 + app->mainmenu_app_index, count);
+                variable_item_set_item_label(item, label);
+                variable_item_set_current_value_text(
+                    item, *CharList_get(app->mainmenu_app_labels, app->mainmenu_app_index));
+            } else {
+                app->mainmenu_app_index = 0;
+                variable_item_set_item_label(item, "App");
+                variable_item_set_current_value_text(item, "None");
+            }
+            variable_item_set_current_value_index(item, app->mainmenu_app_index);
+            variable_item_set_values_count(item, count);
             break;
+        }
         case VarItemListIndexAddApp:
             scene_manager_next_scene(app->scene_manager, XtremeAppSceneInterfaceMainmenuAdd);
             break;
diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c
index e58236102..ba5cae6d0 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_screen.c
@@ -48,6 +48,7 @@ static const struct {
     {"Fuchsia", {255, 0, 255}}, {"Pink", {173, 31, 173}},  {"Brown", {165, 42, 42}},
     {"White", {255, 192, 203}},
 };
+static const size_t lcd_sz = COUNT_OF(lcd_colors);
 static void xtreme_app_scene_misc_screen_lcd_color_changed(VariableItem* item, uint8_t led) {
     XtremeApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -64,6 +65,14 @@ static void xtreme_app_scene_misc_screen_lcd_color_1_changed(VariableItem* item)
 static void xtreme_app_scene_misc_screen_lcd_color_2_changed(VariableItem* item) {
     xtreme_app_scene_misc_screen_lcd_color_changed(item, 2);
 }
+static const struct {
+    uint8_t led;
+    VariableItemChangeCallback cb;
+} lcd_cols[] = {
+    {0, xtreme_app_scene_misc_screen_lcd_color_0_changed},
+    {1, xtreme_app_scene_misc_screen_lcd_color_1_changed},
+    {2, xtreme_app_scene_misc_screen_lcd_color_2_changed},
+};
 
 const char* const rainbow_lcd_names[RGBBacklightRainbowModeCount] = {
     "OFF",
@@ -158,16 +167,6 @@ void xtreme_app_scene_misc_screen_on_enter(void* context) {
     item = variable_item_list_add(var_item_list, "RGB Backlight", 1, NULL, app);
     variable_item_set_current_value_text(item, xtreme_settings.rgb_backlight ? "ON" : "OFF");
 
-    struct {
-        uint8_t led;
-        VariableItemChangeCallback cb;
-    } lcd_cols[] = {
-        {0, xtreme_app_scene_misc_screen_lcd_color_0_changed},
-        {1, xtreme_app_scene_misc_screen_lcd_color_1_changed},
-        {2, xtreme_app_scene_misc_screen_lcd_color_2_changed},
-    };
-    size_t lcd_sz = COUNT_OF(lcd_colors);
-
     RgbColor color;
     for(size_t i = 0; i < COUNT_OF(lcd_cols); i++) {
         char name[12];
@@ -285,8 +284,31 @@ bool xtreme_app_scene_misc_screen_on_event(void* context, SceneManagerEvent even
                 app->save_backlight = true;
                 notification_message(app->notification, &sequence_display_backlight_on);
                 rgb_backlight_reconfigure(xtreme_settings.rgb_backlight);
-                scene_manager_previous_scene(app->scene_manager);
-                scene_manager_next_scene(app->scene_manager, XtremeAppSceneMiscScreen);
+                variable_item_set_current_value_text(
+                    variable_item_list_get(app->var_item_list, VarItemListIndexRgbBacklight),
+                    xtreme_settings.rgb_backlight ? "ON" : "OFF");
+                for(size_t i = 0; i < COUNT_OF(lcd_cols); i++) {
+                    variable_item_set_locked(
+                        variable_item_list_get(app->var_item_list, VarItemListIndexLcdColor0 + i),
+                        !xtreme_settings.rgb_backlight,
+                        "Needs RGB\nBacklight!");
+                }
+                variable_item_set_locked(
+                    variable_item_list_get(app->var_item_list, VarItemListIndexRainbowLcd),
+                    !xtreme_settings.rgb_backlight,
+                    "Needs RGB\nBacklight!");
+                variable_item_set_locked(
+                    variable_item_list_get(app->var_item_list, VarItemListIndexRainbowSpeed),
+                    !xtreme_settings.rgb_backlight,
+                    "Needs RGB\nBacklight!");
+                variable_item_set_locked(
+                    variable_item_list_get(app->var_item_list, VarItemListIndexRainbowInterval),
+                    !xtreme_settings.rgb_backlight,
+                    "Needs RGB\nBacklight!");
+                variable_item_set_locked(
+                    variable_item_list_get(app->var_item_list, VarItemListIndexRainbowSaturation),
+                    !xtreme_settings.rgb_backlight,
+                    "Needs RGB\nBacklight!");
             }
             break;
         }
diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_hopper.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_hopper.c
index 13fdc0ac2..4dabdbeeb 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_hopper.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_hopper.c
@@ -71,16 +71,32 @@ bool xtreme_app_scene_protocols_freqs_hopper_on_event(void* context, SceneManage
                 *FrequencyList_get(app->subghz_hopper_freqs, app->subghz_hopper_index);
             FrequencyList_it_t it;
             FrequencyList_it(it, app->subghz_hopper_freqs);
+            size_t removed = 0;
             while(!FrequencyList_end_p(it)) {
                 if(*FrequencyList_ref(it) == value) {
                     FrequencyList_remove(app->subghz_hopper_freqs, it);
+                    removed++;
                 } else {
                     FrequencyList_next(it);
                 }
             }
             app->save_subghz_freqs = true;
-            scene_manager_previous_scene(app->scene_manager);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsHopper);
+            VariableItem* item =
+                variable_item_list_get(app->var_item_list, VarItemListIndexHopperFrequency);
+            variable_item_set_values_count(item, FrequencyList_size(app->subghz_hopper_freqs));
+            if(FrequencyList_size(app->subghz_hopper_freqs)) {
+                app->subghz_hopper_index -= removed;
+                uint32_t value =
+                    *FrequencyList_get(app->subghz_hopper_freqs, app->subghz_hopper_index);
+                char text[10] = {0};
+                snprintf(
+                    text, sizeof(text), "%lu.%02lu", value / 1000000, (value % 1000000) / 10000);
+                variable_item_set_current_value_text(item, text);
+            } else {
+                app->subghz_hopper_index = 0;
+                variable_item_set_current_value_text(item, "None");
+            }
+            variable_item_set_current_value_index(item, app->subghz_hopper_index);
             break;
         case VarItemListIndexAddHopperFreq:
             scene_manager_set_scene_state(
diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_static.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_static.c
index 2f139b2b2..fdfcde35a 100644
--- a/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_static.c
+++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols_freqs_static.c
@@ -71,16 +71,32 @@ bool xtreme_app_scene_protocols_freqs_static_on_event(void* context, SceneManage
                 *FrequencyList_get(app->subghz_static_freqs, app->subghz_static_index);
             FrequencyList_it_t it;
             FrequencyList_it(it, app->subghz_static_freqs);
+            size_t removed = 0;
             while(!FrequencyList_end_p(it)) {
                 if(*FrequencyList_ref(it) == value) {
                     FrequencyList_remove(app->subghz_static_freqs, it);
+                    removed++;
                 } else {
                     FrequencyList_next(it);
                 }
             }
             app->save_subghz_freqs = true;
-            scene_manager_previous_scene(app->scene_manager);
-            scene_manager_next_scene(app->scene_manager, XtremeAppSceneProtocolsFreqsStatic);
+            VariableItem* item =
+                variable_item_list_get(app->var_item_list, VarItemListIndexStaticFrequency);
+            variable_item_set_values_count(item, FrequencyList_size(app->subghz_static_freqs));
+            if(FrequencyList_size(app->subghz_static_freqs)) {
+                app->subghz_static_index -= removed;
+                uint32_t value =
+                    *FrequencyList_get(app->subghz_static_freqs, app->subghz_static_index);
+                char text[10] = {0};
+                snprintf(
+                    text, sizeof(text), "%lu.%02lu", value / 1000000, (value % 1000000) / 10000);
+                variable_item_set_current_value_text(item, text);
+            } else {
+                app->subghz_static_index = 0;
+                variable_item_set_current_value_text(item, "None");
+            }
+            variable_item_set_current_value_index(item, app->subghz_static_index);
             break;
         case VarItemListIndexAddStaticFreq:
             scene_manager_set_scene_state(

From a4e1a09dc6733b8faf1a179ebd7cfbaca30bf719 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:15:42 +0000
Subject: [PATCH 22/23] More BLE Spam apple colors by @xAstroBoy

---
 applications/external | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/external b/applications/external
index ed832168a..e896285c5 160000
--- a/applications/external
+++ b/applications/external
@@ -1 +1 @@
-Subproject commit ed832168a762fb50fd12909530fd433559daa504
+Subproject commit e896285c57caf626f759241a6dd1b5758943305d

From 74de6f87fccbd41fdfb28aee839298bd336b60ee Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:18:16 +0000
Subject: [PATCH 23/23] Fix leftover comment

---
 applications/services/desktop/animations/animation_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index a4e4558c2..aaf40ef8a 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -406,7 +406,7 @@ static StorageAnimation*
             valid = false;
         }
 
-        if(valid) { // Dont pick error anim randomly
+        if(valid) {
             StorageAnimationList_next(it);
         } else {
             animation_storage_free_storage_animation(&storage_animation);