[apps_container] Reload country and exam mode after DFU

numworks · Apr 16, 2024 · b505da1 · b505da1
1 parent 9c441fe
commit b505da1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp
@@ -62,9 +62,8 @@ App::Snapshot* AppsContainer::usbConnectedAppSnapshot() {
   return &m_usbConnectedSnapshot;
 }
 
-void AppsContainer::setExamMode(Poincare::ExamMode targetExamMode) {
-  ExamMode::Ruleset previousRules =
-      Preferences::SharedPreferences()->examMode().ruleset();
+void AppsContainer::setExamMode(Poincare::ExamMode targetExamMode,
+                                Poincare::ExamMode previousMode) {
   Preferences::SharedPreferences()->setExamMode(targetExamMode);
 
   if (targetExamMode.ruleset() != ExamMode::Ruleset::Off) {
@@ -75,7 +74,7 @@ void AppsContainer::setExamMode(Poincare::ExamMode targetExamMode) {
     for (int i = 0; i < numberOfBuiltinApps(); i++) {
       appSnapshotAtIndex(i)->reset();
     }
-  } else if (previousRules == ExamMode::Ruleset::PressToTest) {
+  } else if (previousMode.ruleset() == ExamMode::Ruleset::PressToTest) {
     // Reset when leaving PressToTest mode.
     Ion::Reset::core();
   }
@@ -179,6 +178,12 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
       updateBatteryState();
       switchToBuiltinApp(usbConnectedAppSnapshot());
       Ion::USB::DFU();
+      /* DFU might have changed preferences and global preferences, update those
+       * that have callbacks : country and exam mode.*/
+      GlobalPreferences::SharedGlobalPreferences()->setCountry(
+          GlobalPreferences::SharedGlobalPreferences()->country());
+      setExamMode(Preferences::SharedPreferences()->examMode(),
+                  Ion::ExamMode::get());
       // Update LED when exiting DFU mode
       Ion::LED::updateColorWithPlugAndCharge();
       switchToBuiltinApp(activeSnapshot);
@@ -279,7 +284,7 @@ void AppsContainer::run() {
   Preferences* poincarePreferences = Preferences::SharedPreferences();
   Poincare::ExamMode examMode = poincarePreferences->examMode();
   if (examMode.isActive()) {
-    setExamMode(examMode);
+    setExamMode(examMode, Poincare::ExamMode());
   } else {
     refreshPreferences();
   }

diff --git a/apps/apps_container.h b/apps/apps_container.h
@@ -33,7 +33,8 @@ class AppsContainer : public Escher::Container, Ion::Storage::StorageDelegate {
   Escher::App::Snapshot* onBoardingAppSnapshot();
   Escher::App::Snapshot* usbConnectedAppSnapshot();
   Home::App::Snapshot* homeAppSnapshot() { return &m_homeSnapshot; }
-  void setExamMode(Poincare::ExamMode targetExamMode);
+  void setExamMode(Poincare::ExamMode targetExamMode,
+                   Poincare::ExamMode previousMode);
   Shared::GlobalContext* globalContext();
   void didSuspend();
   bool dispatchEvent(Ion::Events::Event event) override;

diff --git a/apps/exam_pop_up_controller.cpp b/apps/exam_pop_up_controller.cpp
@@ -94,6 +94,7 @@ I18n::Message ExamPopUpController::activationWarningMessage() const {
 bool ExamPopUpController::handleButton() const {
   /* Warning : By unplugging before confirmation, the examMode may then be
    *           deactivated while unplugged. */
-  AppsContainer::sharedAppsContainer()->setExamMode(m_targetExamMode);
+  AppsContainer::sharedAppsContainer()->setExamMode(
+      m_targetExamMode, Preferences::SharedPreferences()->examMode());
   return true;
 }
diff --git a/poincare/src/preferences.cpp b/poincare/src/preferences.cpp
@@ -54,9 +54,6 @@ ExamMode Preferences::examMode() const {
 }
 
 void Preferences::setExamMode(ExamMode mode) {
-  if (m_examMode == mode) {
-    return;
-  }
   m_examMode = mode;
   Ion::ExamMode::set(mode);
 }