Fixed race condition issue on avatarsMap + listener removed by mistake

app/src/main/java/org/linphone/contacts/ContactsManager.kt

@@ -127,10 +127,10 @@ class ContactsManager @UiThread constructor(context: Context) {
     fun onNativeContactsLoaded() {
         nativeContactsLoaded = true
 
-        avatarsMap.values.forEach(ContactAvatarModel::destroy)
-        avatarsMap.clear()
-
         coreContext.postOnCoreThread {
+            avatarsMap.values.forEach(ContactAvatarModel::destroy)
+            avatarsMap.clear()
+
             notifyContactsListChanged()
         }
     }

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

@@ -116,7 +116,9 @@ class DrawerMenuFragment : GenericFragment() {
 
         viewModel.defaultAccountChangedEvent.observe(viewLifecycleOwner) {
             it.consume { identity ->
-                Log.w("$TAG Default account has changed, now is [$identity], closing side menu in 500ms")
+                Log.w(
+                    "$TAG Default account has changed, now is [$identity], closing side menu in 500ms"
+                )
                 sharedViewModel.defaultAccountChangedEvent.value = Event(true)
 
                 lifecycleScope.launch {

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

@@ -121,6 +121,10 @@ open class AbstractTopBarViewModel @UiThread constructor() : ViewModel() {
     init {
         searchBarVisible.value = false
 
+        coreContext.postOnCoreThread { core ->
+            core.addListener(coreListener)
+        }
+
         update()
     }