5 files changed, 27 insertions(+), 8 deletions(-)

M module-apps/application-settings-new/models/ApnSettingsModel.cpp
M module-apps/application-settings-new/models/ApnSettingsModel.hpp
M module-apps/application-settings-new/windows/ApnSettingsWindow.cpp
M module-apps/application-settings-new/windows/ApnSettingsWindow.hpp
M module-services/service-cellular/service-cellular/PacketDataTypes.hpp

@@ 15,11 15,18 @@ void ApnSettingsModel::requestAPNList()
 
 void ApnSettingsModel::saveAPN(std::shared_ptr<packet_data::APN::Config> apn)
 {
-    sys::Bus::SendUnicast(std::make_shared<CellularSetAPNMessage>(apn), ServiceCellular::serviceName, application);
+    if (apn->contextId != packet_data::EmptyContextId) {
+        CellularServiceAPI::SetAPN(application, *apn);
+    }
+    else {
+        CellularServiceAPI::NewAPN(application, *apn);
+    }
 }
 
 void ApnSettingsModel::removeAPN(std::shared_ptr<packet_data::APN::Config> apn)
-{}
+{
+    CellularServiceAPI::DeleteAPN(application, apn->contextId);
+}
 
 void ApnSettingsModel::setAsDefaultAPN(std::shared_ptr<packet_data::APN::Config> apn)
 {

@@ 4,6 4,7 @@
 #pragma once
 
 #include <service-cellular/PacketDataTypes.hpp>
+#include <service-cellular/CellularServiceAPI.hpp>
 #include <module-apps/Application.hpp>
 
 class ApnSettingsModel

@@ 4,7 4,6 @@
 #include "ApnSettingsWindow.hpp"
 #include "application-settings-new/ApplicationSettings.hpp"
 #include "application-settings-new/data/ApnListData.hpp"
-#include "application-settings-new/models/ApnSettingsModel.hpp"
 #include "application-settings-new/widgets/SettingsStyle.hpp"
 #include "application-settings-new/data/SettingsItemData.hpp"
 #include "OptionSetting.hpp"


@@ 45,7 44,8 @@ namespace gui
 
         bottomBar->setText(BottomBar::Side::LEFT, utils::localize.get(style::strings::common::options));
 
-        auto apnSettingsModel = new ApnSettingsModel(application);
+        activeApn        = std::make_shared<packet_data::APN::Config>();
+        apnSettingsModel = std::make_shared<ApnSettingsModel>(application);
         apnSettingsModel->requestAPNList();
     }
     auto ApnSettingsWindow::handleSwitchData(SwitchData *data) -> bool


@@ 82,6 82,11 @@ namespace gui
         }
 
         addOptions(optionsList(apns));
+
+        if (mode == gui::ShowMode::GUI_SHOW_RETURN) {
+            apnSettingsModel->requestAPNList();
+        }
+
         bottomBar->setActive(gui::BottomBar::Side::LEFT, true);
         bottomBar->setActive(gui::BottomBar::Side::CENTER, true);
     }


@@ 101,8 106,7 @@ namespace gui
             return true;
         }
         if (inputEvent.is(gui::KeyCode::KEY_LF)) {
-            auto apnRecord                        = std::make_shared<packet_data::APN::Config>();
-            std::unique_ptr<gui::SwitchData> data = std::make_unique<ApnItemData>(apnRecord);
+            std::unique_ptr<gui::SwitchData> data = std::make_unique<ApnItemData>(activeApn);
             application->switchWindow(gui::window::name::apn_options, gui::ShowMode::GUI_SHOW_INIT, std::move(data));
             return true;
         }


@@ 125,7 129,10 @@ namespace gui
                         gui::window::name::new_apn, gui::ShowMode::GUI_SHOW_INIT, std::move(apnData));
                     return true;
                 },
-                nullptr,
+                [=](gui::Item &item) {
+                    activeApn = apn;
+                    return true;
+                },
                 nullptr));
         }
 

@@ 4,6 4,8 @@
 #pragma once
 
 #include "OptionWindow.hpp"
+#include "application-settings-new/models/ApnSettingsModel.hpp"
+
 #include <Icon.hpp>
 #include <service-cellular/PacketDataTypes.hpp>
 


@@ 25,5 27,7 @@ namespace gui
         Image *crossImage     = nullptr;
         Icon *emptyListIcon   = nullptr;
         std::vector<std::shared_ptr<packet_data::APN::Config>> apns;
+        std::shared_ptr<packet_data::APN::Config> activeApn;
+        std::shared_ptr<ApnSettingsModel> apnSettingsModel;
     };
 }; // namespace gui

@@ 210,7 210,7 @@ namespace packet_data
         };
 
     } // namespace APN
-
+    constexpr unsigned char EmptyContextId = 0;
     constexpr unsigned char MINContextId = 1;
     constexpr unsigned char MAXContextId = 16;