From 6b11e37b14af2ae417aea00521b83815e1a29706 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 2 Dec 2024 11:25:30 +0100 Subject: [PATCH] Make sure newly added account is marked as default in side menu --- app/src/main/java/org/linphone/ui/main/model/AccountModel.kt | 1 + .../org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt index ca5074ed3..a4902c587 100644 --- a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt +++ b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt @@ -120,6 +120,7 @@ class AccountModel @WorkerThread constructor( account.addListener(accountListener) coreContext.core.addListener(coreListener) + isDefault.postValue(false) presenceStatus.postValue(ConsolidatedPresence.Offline) showMwi.postValue(false) voicemailCount.postValue("") diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt index 72d56c47a..79d761f68 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt @@ -82,9 +82,7 @@ class DrawerMenuViewModel @UiThread constructor() : GenericViewModel() { "$TAG Account [${account.params.identityAddress?.asStringUriOnly()}] has been set as default" ) for (model in accounts.value.orEmpty()) { - if (model.account != account) { - model.isDefault.postValue(false) - } + model.isDefault.postValue(model.account == account) } defaultAccountChangedEvent.postValue( Event(account.params.identityAddress?.asStringUriOnly() ?: "")