UE refactor

src/ue/mm/auth.cpp

@@ -353,7 +353,7 @@ void NasMm::receiveAuthenticationReject(const nas::AuthenticationReject &msg)
     switchUState(E5UState::U3_ROAMING_NOT_ALLOWED);
     // Delete the stored 5G-GUTI, TAI list, last visited registered TAI and ngKSI. The USIM shall be considered invalid
     // until switching off the UE or the UICC containing the USIM is removed
-    m_storage.invalidateSim();
+    m_storage.invalidateSim__();
     // The UE shall abort any 5GMM signalling procedure, stop any of the timers T3510, T3516, T3517, T3519 or T3521 (if
     // they were running) ..
     m_timers->t3510.stop();

src/ue/mm/dereg.cpp

@@ -162,7 +162,7 @@ void NasMm::receiveDeregistrationRequest(const nas::DeRegistrationRequestUeTermi
             case nas::EMmCause::ILLEGAL_ME:
             case nas::EMmCause::FIVEG_SERVICES_NOT_ALLOWED: {
                 switchUState(E5UState::U3_ROAMING_NOT_ALLOWED);
-                m_storage.invalidateSim();
+                m_storage.invalidateSim__();
                 switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_NA);
                 break;
             }
@@ -198,7 +198,7 @@ void NasMm::receiveDeregistrationRequest(const nas::DeRegistrationRequestUeTermi
                               nas::utils::EnumToString(msg.mmCause->value));
 
                 switchUState(E5UState::U3_ROAMING_NOT_ALLOWED);
-                m_storage.invalidateSim();
+                m_storage.invalidateSim__();
                 switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_NA);
                 break;
             }

src/ue/mm/register.cpp

@@ -76,7 +76,10 @@ void NasMm::receiveRegistrationAccept(const nas::RegistrationAccept &msg)
 
     bool sendCompleteMes = false;
 
-    m_storage.m_taiList = msg.taiList;
+    if (msg.taiList.has_value())
+        m_storage.m_taiList = *msg.taiList;
+    else
+        m_storage.m_taiList = {};
 
     if (msg.t3512Value.has_value() && nas::utils::HasValue(msg.t3512Value.value()))
     {