Show internal memory only in DEBUG mode + other fixes

Remove unused imports and remove my old code that used to hide layouts and tmp history folders, this was removed in dev but somehow was added back here
RogueMaster · Feb 11, 2023 · a4c28ed · a4c28ed
1 parent b8deb93
commit a4c28ed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c
@@ -8,6 +8,7 @@
 #include <gui/modules/file_browser_worker.h>
 #include <fap_loader/fap_loader_app.h>
 #include <math.h>
+#include <furi_hal.h>
 
 static void
     archive_folder_open_cb(void* context, uint32_t item_cnt, int32_t file_idx, bool is_root) {
@@ -462,6 +463,13 @@ void archive_switch_tab(ArchiveBrowserView* browser, InputKey key) {
     } else {
         tab = (tab + 1) % ArchiveTabTotal;
     }
+    if(tab == ArchiveTabInternal && !furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
+        if(key == InputKeyLeft) {
+            tab = ((tab - 1) + ArchiveTabTotal) % ArchiveTabTotal;
+        } else {
+            tab = (tab + 1) % ArchiveTabTotal;
+        }
+    }
 
     browser->is_root = true;
     archive_set_tab(browser, tab);

diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h
@@ -3,7 +3,6 @@
 #include <m-array.h>
 #include <furi.h>
 #include <m-algo.h>
-#include <m-string.h>
 #include <storage/storage.h>
 #include "toolbox/path.h"
 

diff --git a/applications/services/gui/modules/file_browser.c b/applications/services/gui/modules/file_browser.c
@@ -11,7 +11,6 @@
 #include <core/check.h>
 #include <core/common_defines.h>
 #include <core/log.h>
-#include "m-string.h"
 #include "m-algo.h"
 #include <m-array.h>
 

diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c
@@ -15,8 +15,6 @@
 #define TAG "BrowserWorker"
 
 #define ASSETS_DIR "assets"
-#define BADUSB_LAYOUTS_DIR "layouts"
-#define SUBGHZ_TEMP_DIR "tmp_history"
 #define BROWSER_ROOT STORAGE_ANY_PATH_PREFIX
 #define FILE_NAME_LEN_MAX 256
 #define LONG_LOAD_THRESHOLD 100
@@ -92,9 +90,7 @@ static bool browser_filter_by_name(BrowserWorker* browser, FuriString* name, boo
     if(is_folder) {
         // Skip assets folders (if enabled)
         if(browser->skip_assets) {
-            return ((furi_string_cmp_str(name, ASSETS_DIR) == 0) ? (false) : (true)) &&
-                   ((furi_string_cmp_str(name, BADUSB_LAYOUTS_DIR) == 0) ? (false) : (true)) &&
-                   ((furi_string_cmp_str(name, SUBGHZ_TEMP_DIR) == 0) ? (false) : (true));
+            return ((furi_string_cmp_str(name, ASSETS_DIR) == 0) ? (false) : (true));
         } else {
             return true;
         }