Merge branch 'pr/445' into 420

applications/services/gui/modules/file_browser.c

@@ -614,6 +614,19 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
             }
             consumed = true;
         }
+    } else if(event->key == InputKeyBack) {
+        if(event->type == InputTypeShort) {
+            bool is_root = false;
+            with_view_model(
+                browser->view, FileBrowserModel * model, { is_root = model->is_root; }, false);
+
+            if(!is_root && !file_browser_worker_is_in_start_folder(browser->worker)) {
+                consumed = true;
+                if(!is_root) {
+                    file_browser_worker_folder_exit(browser->worker);
+                }
+            }
+        }
     }
 
     return consumed;

applications/services/gui/modules/file_browser_worker.c

@@ -37,6 +37,8 @@ struct BrowserWorker {
     FuriThread* thread;
 
     FuriString* filter_extension;
+    FuriString* path_start;
+    FuriString* path_current;
     FuriString* path_next;
     int32_t item_sel_idx;
     uint32_t load_offset;
@@ -293,6 +295,7 @@ static int32_t browser_worker(void* context) {
 
             int32_t file_idx = 0;
             browser_folder_init(browser, path, filename, &items_cnt, &file_idx);
+            furi_string_set(browser->path_current, path);
             FURI_LOG_D(
                 TAG,
                 "Enter folder: %s items: %lu idx: %ld",
@@ -315,6 +318,7 @@ static int32_t browser_worker(void* context) {
                 // Pop previous selected item index from history array
                 idx_last_array_pop_back(&file_idx, browser->idx_last);
             }
+            furi_string_set(browser->path_current, path);
             FURI_LOG_D(
                 TAG,
                 "Exit to: %s items: %lu idx: %ld",
@@ -369,8 +373,14 @@ BrowserWorker*
 
     browser->filter_extension = furi_string_alloc_set(filter_ext);
     browser->skip_assets = skip_assets;
+    browser->path_start = furi_string_alloc_set(path);
+    browser->path_current = furi_string_alloc_set(path);
     browser->path_next = furi_string_alloc_set(path);
 
+    if(browser_path_is_file(browser->path_start)) {
+        browser_path_trim(browser->path_start);
+    }
+
     browser->thread = furi_thread_alloc_ex("BrowserWorker", 2048, browser_worker, browser);
     furi_thread_start(browser->thread);
 
@@ -386,6 +396,8 @@ void file_browser_worker_free(BrowserWorker* browser) {
 
     furi_string_free(browser->filter_extension);
     furi_string_free(browser->path_next);
+    furi_string_free(browser->path_current);
+    furi_string_free(browser->path_start);
 
     idx_last_array_clear(browser->idx_last);
 
@@ -444,6 +456,11 @@ void file_browser_worker_folder_enter(BrowserWorker* browser, FuriString* path,
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderEnter);
 }
 
+bool file_browser_worker_is_in_start_folder(BrowserWorker* browser) {
+    furi_assert(browser);
+    return (furi_string_cmp(browser->path_start, browser->path_current) == 0);
+}
+
 void file_browser_worker_folder_exit(BrowserWorker* browser) {
     furi_assert(browser);
     furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderExit);

applications/services/gui/modules/file_browser_worker.h

@@ -52,6 +52,8 @@ void file_browser_worker_set_config(
 
 void file_browser_worker_folder_enter(BrowserWorker* browser, FuriString* path, int32_t item_idx);
 
+bool file_browser_worker_is_in_start_folder(BrowserWorker* browser);
+
 void file_browser_worker_folder_exit(BrowserWorker* browser);
 
 void file_browser_worker_folder_refresh(BrowserWorker* browser, int32_t item_idx);

firmware/targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,7.52,,
+Version,+,7.6,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -836,6 +836,7 @@ Function,+,file_browser_worker_folder_enter,void,"BrowserWorker*, FuriString*, i
 Function,+,file_browser_worker_folder_exit,void,BrowserWorker*
 Function,+,file_browser_worker_folder_refresh,void,"BrowserWorker*, int32_t"
 Function,+,file_browser_worker_free,void,BrowserWorker*
+Function,+,file_browser_worker_is_in_start_folder,_Bool,BrowserWorker*
 Function,+,file_browser_worker_load,void,"BrowserWorker*, uint32_t, uint32_t"
 Function,+,file_browser_worker_set_callback_context,void,"BrowserWorker*, void*"
 Function,+,file_browser_worker_set_config,void,"BrowserWorker*, FuriString*, const char*, _Bool"