From c40944b4cf9f929ac054801f7dbdab5274687841 Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Sun, 26 Jan 2025 20:10:28 +0100 Subject: [PATCH 1/3] count restored messages --- source/graphics/common/ViewController.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/graphics/common/ViewController.cpp b/source/graphics/common/ViewController.cpp index 694e790..f89633a 100644 --- a/source/graphics/common/ViewController.cpp +++ b/source/graphics/common/ViewController.cpp @@ -586,7 +586,7 @@ void ViewController::beginRestoreTextMessages(void) { configCompleted = true; restoreTimer = millis(); - ILOG_DEBUG("loading persistent messages..."); + ILOG_INFO("loading persistent messages..."); } /** @@ -594,15 +594,19 @@ void ViewController::beginRestoreTextMessages(void) */ void ViewController::restoreTextMessages(void) { + static uint32_t msgCounter = 0; LogMessageEnv msg; if (log.readNext(msg)) { view->restoreMessage(msg); + msgCounter++; } else { - ILOG_DEBUG("restoring log messages completed in %dms.", millis() - restoreTimer); + ILOG_INFO("restoring %d messages completed in %dms.", msgCounter, millis() - restoreTimer); + msgCounter = 0; messagesRestored = true; view->notifyMessagesRestored(); } } + /** * write a flag into message log that chat has been deleted * The call removeTextMessages(0,0,0) removes all logs. From 025285cec32694121ee9d402a10da0dc13f95bed Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:56:07 +0100 Subject: [PATCH 2/3] show msg restoration banner --- source/graphics/TFT/TFTView_320x240.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/graphics/TFT/TFTView_320x240.cpp b/source/graphics/TFT/TFTView_320x240.cpp index 170ca41..1edb762 100644 --- a/source/graphics/TFT/TFTView_320x240.cpp +++ b/source/graphics/TFT/TFTView_320x240.cpp @@ -5348,6 +5348,7 @@ void TFTView_320x240::notifyRestoreMessages(int32_t percentage) lv_label_set_text(objects.msg_popup_label, buf); lv_obj_clear_flag(objects.msg_popup_panel, LV_OBJ_FLAG_HIDDEN); lv_group_focus_obj(objects.msg_popup_button); + lv_task_handler(); } else { lv_obj_add_flag(objects.msg_popup_panel, LV_OBJ_FLAG_HIDDEN); ILOG_DEBUG("notifyRestoreMessages finished"); From f0564aeedc2f6678f35be6cda44f108291414027 Mon Sep 17 00:00:00 2001 From: Manuel <71137295+mverch67@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:58:26 +0100 Subject: [PATCH 3/3] Update ViewController.cpp Tweak when to display restoration banner --- source/graphics/common/ViewController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/graphics/common/ViewController.cpp b/source/graphics/common/ViewController.cpp index f89633a..4baf559 100644 --- a/source/graphics/common/ViewController.cpp +++ b/source/graphics/common/ViewController.cpp @@ -882,7 +882,7 @@ bool ViewController::packetReceived(const meshtastic_MeshPacket &p) ILOG_DEBUG("loading all logs at once"); int32_t percentage = log.current() * 100 / log.count(); bool showPercentage = false; - if (log.count() > 2 && percentage < 50) { // TODO: was 10 + if (log.count() > 3 && percentage < 80) { showPercentage = true; view->notifyRestoreMessages(percentage); }