Improved parsing of account settings + navigate out of resuming fragment if no longer available due to config changes

app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt

@@ -309,6 +309,13 @@ class ConversationsListFragment : AbstractTopBarFragment() {
     override fun onResume() {
         super.onResume()
 
+        if (listViewModel.hideMeetings.value == true) {
+            Log.w(
+                "$TAG Resuming fragment that should no longer be accessible, going to contacts list instead"
+            )
+            sharedViewModel.navigateToContactsEvent.value = Event(true)
+        }
+
         try {
             adapter.registerAdapterDataObserver(dataObserver)
         } catch (e: IllegalStateException) {

app/src/main/java/org/linphone/ui/main/fragment/AbstractTopBarFragment.kt

@@ -167,6 +167,12 @@ abstract class AbstractTopBarFragment : GenericFragment() {
                 viewModel.resetMissedCallsCount()
             }
         }
+
+        sharedViewModel.forceUpdateAvailableNavigationItems.observe(viewLifecycleOwner) {
+            it.consume {
+                viewModel.updateAvailableMenus()
+            }
+        }
     }
 
     fun initBottomNavBar(navBar: View) {

app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt

@@ -39,6 +39,7 @@ import org.linphone.ui.main.fragment.AbstractTopBarFragment
 import org.linphone.ui.main.meetings.adapter.MeetingsListAdapter
 import org.linphone.ui.main.meetings.viewmodel.MeetingsListViewModel
 import org.linphone.utils.AppUtils
+import org.linphone.utils.Event
 import org.linphone.utils.RecyclerViewHeaderDecoration
 
 @UiThread
@@ -219,6 +220,17 @@ class MeetingsListFragment : AbstractTopBarFragment() {
         bottomSheetDialog = null
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (listViewModel.hideMeetings.value == true) {
+            Log.w(
+                "$TAG Resuming fragment that should no longer be accessible, going to contacts list instead"
+            )
+            sharedViewModel.navigateToContactsEvent.value = Event(true)
+        }
+    }
+
     private fun scrollToToday() {
         val todayMeeting = listViewModel.meetings.value.orEmpty().find {
             it.isToday

app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt

@@ -18,6 +18,7 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.AccountSettingsFragmentBinding
 import org.linphone.ui.main.fragment.GenericFragment
 import org.linphone.ui.main.settings.viewmodel.AccountSettingsViewModel
+import org.linphone.utils.Event
 
 @UiThread
 class AccountSettingsFragment : GenericFragment() {
@@ -113,5 +114,7 @@ class AccountSettingsFragment : GenericFragment() {
         super.onPause()
 
         viewModel.saveChanges()
+        // It is possible some value have changed, causing some menu to appear or disappear
+        sharedViewModel.forceUpdateAvailableNavigationItems.value = Event(true)
     }
 }

app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountSettingsViewModel.kt

@@ -26,7 +26,6 @@ import java.util.Locale
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.core.AVPFMode
 import org.linphone.core.Account
-import org.linphone.core.Factory
 import org.linphone.core.NatPolicy
 import org.linphone.core.TransportType
 import org.linphone.core.tools.Log
@@ -122,7 +121,7 @@ class AccountSettingsViewModel @UiThread constructor() : ViewModel() {
 
                 val server = sipProxyServer.value.orEmpty()
                 if (server.isNotEmpty()) {
-                    val serverAddress = Factory.instance().createAddress(server)
+                    val serverAddress = core.interpretUrl(server, false)
                     if (serverAddress != null) {
                         serverAddress.transport = selectedTransport.value
                         newParams.serverAddress = serverAddress
@@ -142,13 +141,15 @@ class AccountSettingsViewModel @UiThread constructor() : ViewModel() {
 
                 newParams.expires = expire.value?.toInt() ?: 31536000
 
-                val conferenceFactoryAddress = Factory.instance().createAddress(
+                val conferenceFactoryAddress = core.interpretUrl(
-                    conferenceFactoryUri.value.orEmpty()
+                    conferenceFactoryUri.value.orEmpty(),
+                    false
                 )
                 newParams.conferenceFactoryAddress = conferenceFactoryAddress
 
-                val audioVideoConferenceFactoryAddress = Factory.instance().createAddress(
+                val audioVideoConferenceFactoryAddress = core.interpretUrl(
-                    audioVideoConferenceFactoryUri.value.orEmpty()
+                    audioVideoConferenceFactoryUri.value.orEmpty(),
+                    false
                 )
                 newParams.audioVideoConferenceFactoryAddress = audioVideoConferenceFactoryAddress
 

app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt

@@ -69,6 +69,10 @@ class SharedMainViewModel @UiThread constructor() : ViewModel() {
         MutableLiveData<Event<Boolean>>()
     }
 
+    val forceUpdateAvailableNavigationItems: MutableLiveData<Event<Boolean>> by lazy {
+        MutableLiveData<Event<Boolean>>()
+    }
+
     /* Contacts related */
 
     val showContactEvent: MutableLiveData<Event<String>> by lazy {