diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt index 453cc0cba..646dd5e2c 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt +++ b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt @@ -23,10 +23,10 @@ import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import java.util.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.util.* import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.core.AudioDevice import org.linphone.core.Call diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt index 094ab72a8..1ad92124d 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt @@ -75,7 +75,7 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() { init { createGroupChat.value = false - sipContactsSelected.value = true + sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList() isEncrypted.value = false selectedAddresses.value = arrayListOf() diff --git a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt index 9cea16233..1d02e5bd1 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt @@ -45,7 +45,7 @@ class ContactsListViewModel : ViewModel() { } init { - sipContactsSelected.value = true + sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList() coreContext.contactsManager.addListener(contactsUpdatedListener) } diff --git a/app/src/main/java/org/linphone/contact/ContactsManager.kt b/app/src/main/java/org/linphone/contact/ContactsManager.kt index dbfd0020c..fec92d965 100644 --- a/app/src/main/java/org/linphone/contact/ContactsManager.kt +++ b/app/src/main/java/org/linphone/contact/ContactsManager.kt @@ -132,6 +132,10 @@ class ContactsManager(private val context: Context) { ) } + fun shouldDisplaySipContactsList(): Boolean { + return coreContext.core.defaultProxyConfig?.identityAddress?.domain == corePreferences.defaultDomain + } + @Synchronized fun fetchContactsAsync() { if (loadContactsTask != null) {