From 2d7447d9793bfb31b0e99aa6f61267c398e4bb08 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 21 Jun 2023 13:24:51 +0100
Subject: [PATCH] Use prev basename instead of index on folder exit

Keeps folder history after closing external app
---
 .../main/archive/helpers/archive_browser.c     | 16 ++++++++++++++++
 .../services/gui/modules/file_browser_worker.c | 18 +++---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/applications/main/archive/helpers/archive_browser.c b/applications/main/archive/helpers/archive_browser.c
index 5c6f486d1..aca4e7523 100644
--- a/applications/main/archive/helpers/archive_browser.c
+++ b/applications/main/archive/helpers/archive_browser.c
@@ -75,11 +75,27 @@ static void archive_list_item_cb(
             ArchiveBrowserViewModel * model,
             {
                 if(model->item_cnt <= BROWSER_SORT_THRESHOLD) {
+                    FuriString* selected = NULL;
+                    if(model->item_idx > 0) {
+                        selected = furi_string_alloc_set(
+                            files_array_get(model->files, model->item_idx)->path);
+                    }
+
                     files_array_sort(model->files);
+
+                    if(selected != NULL) {
+                        for(uint32_t i = 0; i < model->item_cnt; i++) {
+                            if(!furi_string_cmp(files_array_get(model->files, i)->path, selected)) {
+                                model->item_idx = i;
+                                break;
+                            }
+                        }
+                    }
                 }
                 model->list_loading = false;
             },
             true);
+        archive_update_offset(browser);
     }
 }
 
diff --git a/applications/services/gui/modules/file_browser_worker.c b/applications/services/gui/modules/file_browser_worker.c
index bde6c02a7..1431041fd 100644
--- a/applications/services/gui/modules/file_browser_worker.c
+++ b/applications/services/gui/modules/file_browser_worker.c
@@ -32,8 +32,6 @@ typedef enum {
     (WorkerEvtStop | WorkerEvtLoad | WorkerEvtFolderEnter | WorkerEvtFolderExit | \
      WorkerEvtFolderRefresh | WorkerEvtConfigChange)
 
-ARRAY_DEF(idx_last_array, int32_t)
-
 struct BrowserWorker {
     FuriThread* thread;
 
@@ -46,7 +44,6 @@ struct BrowserWorker {
     uint32_t load_count;
     bool skip_assets;
     bool hide_dot_files;
-    idx_last_array_t idx_last;
 
     void* cb_ctx;
     BrowserWorkerFolderOpenCallback folder_cb;
@@ -345,7 +342,6 @@ static int32_t browser_worker(void* context) {
             if(browser_path_is_file(browser->path_next)) {
                 path_extract_filename(browser->path_next, filename, false);
             }
-            idx_last_array_reset(browser->idx_last);
 
             furi_thread_flags_set(furi_thread_get_id(browser->thread), WorkerEvtFolderEnter);
         }
@@ -354,9 +350,6 @@ static int32_t browser_worker(void* context) {
             furi_string_set(path, browser->path_next);
             bool is_root = browser_folder_check_and_switch(path);
 
-            // Push previous selected item index to history array
-            idx_last_array_push_back(browser->idx_last, browser->item_sel_idx);
-
             int32_t file_idx = 0;
             browser_folder_init(browser, path, filename, &items_cnt, &file_idx);
             furi_string_set(browser->path_current, path);
@@ -373,15 +366,13 @@ static int32_t browser_worker(void* context) {
         }
 
         if(flags & WorkerEvtFolderExit) {
+            path_extract_basename(furi_string_get_cstr(path), filename);
+
             browser_path_trim(path);
             bool is_root = browser_folder_check_and_switch(path);
 
             int32_t file_idx = 0;
             browser_folder_init(browser, path, filename, &items_cnt, &file_idx);
-            if(idx_last_array_size(browser->idx_last) > 0) {
-                // 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,
@@ -392,6 +383,7 @@ static int32_t browser_worker(void* context) {
             if(browser->folder_cb) {
                 browser->folder_cb(browser->cb_ctx, items_cnt, file_idx, is_root);
             }
+            furi_string_reset(filename);
         }
 
         if(flags & WorkerEvtFolderRefresh) {
@@ -442,8 +434,6 @@ BrowserWorker* file_browser_worker_alloc(
     bool hide_dot_files) {
     BrowserWorker* browser = malloc(sizeof(BrowserWorker));
 
-    idx_last_array_init(browser->idx_last);
-
     browser->filter_extension = furi_string_alloc_set(filter_ext);
     browser->skip_assets = skip_assets;
     browser->hide_dot_files = hide_dot_files;
@@ -474,8 +464,6 @@ void file_browser_worker_free(BrowserWorker* browser) {
     furi_string_free(browser->path_current);
     furi_string_free(browser->path_start);
 
-    idx_last_array_clear(browser->idx_last);
-
     free(browser);
 }