Merge branch 'main' of github.com:vicliu624/trail-mate

Author: vicliu624

src/app/app_config.h

@@ -252,8 +252,25 @@ struct AppConfig
         meshcore_config.meshcore_channel_name[sizeof(meshcore_config.meshcore_channel_name) - 1] = '\0';
         prefs.getBytes("mc_ch_key", meshcore_config.secondary_key, sizeof(meshcore_config.secondary_key));
 
-        mesh_protocol = static_cast<chat::MeshProtocol>(
-            prefs.getUChar("mesh_protocol", static_cast<uint8_t>(chat::MeshProtocol::Meshtastic)));
+        uint8_t mesh_protocol_raw = prefs.getUChar("mesh_protocol", 0xFF);
+        if (mesh_protocol_raw == static_cast<uint8_t>(chat::MeshProtocol::Meshtastic) ||
+            mesh_protocol_raw == static_cast<uint8_t>(chat::MeshProtocol::MeshCore))
+        {
+            mesh_protocol = static_cast<chat::MeshProtocol>(mesh_protocol_raw);
+        }
+        else
+        {
+            int legacy_protocol = prefs.getInt("mesh_protocol",
+                                               static_cast<int>(chat::MeshProtocol::Meshtastic));
+            if (legacy_protocol == static_cast<int>(chat::MeshProtocol::MeshCore))
+            {
+                mesh_protocol = chat::MeshProtocol::MeshCore;
+            }
+            else
+            {
+                mesh_protocol = chat::MeshProtocol::Meshtastic;
+            }
+        }
 
         // Load device name
         size_t len = prefs.getBytes("node_name", node_name, sizeof(node_name) - 1);
@@ -402,6 +419,8 @@ struct AppConfig
         prefs.putBool("mc_tx_en", meshcore_config.tx_enabled);
         prefs.putString("mc_ch_name", meshcore_config.meshcore_channel_name);
         prefs.putBytes("mc_ch_key", meshcore_config.secondary_key, sizeof(meshcore_config.secondary_key));
+        // Remove first so legacy key type mismatches cannot block updating this value.
+        prefs.remove("mesh_protocol");
         prefs.putUChar("mesh_protocol", static_cast<uint8_t>(mesh_protocol));
 
         // Save device name

src/ui/screens/settings/settings_page_components.cpp

@@ -892,9 +892,20 @@ static void on_option_clicked(lv_event_t* e)
     if (payload->item->pref_key && strcmp(payload->item->pref_key, "mesh_protocol") == 0)
     {
         app::AppContext& app_ctx = app::AppContext::getInstance();
-        app_ctx.getConfig().mesh_protocol = static_cast<chat::MeshProtocol>(payload->value);
-        app_ctx.saveConfig();
-        restart_now = true;
+        chat::MeshProtocol target = static_cast<chat::MeshProtocol>(payload->value);
+        if (!app_ctx.switchMeshProtocol(target, true))
+        {
+            *payload->item->enum_value = previous_value;
+            prefs_put_int(payload->item->pref_key, previous_value);
+            update_item_value(*payload->widget);
+            ::ui::SystemNotification::show("Protocol switch failed", 3000);
+        }
+        else
+        {
+            rebuild_list = true;
+            ::ui::SystemNotification::show("Protocol switched", 2000);
+            restart_now = true;
+        }
     }
     if (payload->item->pref_key && strcmp(payload->item->pref_key, "chat_region") == 0)
     {