Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only show SIP contacts list by default when default proxy config is a sip.linphone.org account

Browse source
This commit is contained in:
Sylvain Berfini 2020-08-20 15:45:16 +02:00
parent 932a3a7265
commit 7ee8ba34b0
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/call/viewmodels/ControlsFadingViewModel.kt
View file

@ -23,10 +23,10 @@ import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import java.util.*
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.util.*
import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.core.AudioDevice import org.linphone.core.AudioDevice
import org.linphone.core.Call import org.linphone.core.Call

2
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
View file

@ -75,7 +75,7 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() {
init { init {
createGroupChat.value = false createGroupChat.value = false
sipContactsSelected.value = true sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList()
isEncrypted.value = false isEncrypted.value = false
selectedAddresses.value = arrayListOf() selectedAddresses.value = arrayListOf()

2
app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactsListViewModel.kt
View file

@ -45,7 +45,7 @@ class ContactsListViewModel : ViewModel() {
} }
init { init {
sipContactsSelected.value = true sipContactsSelected.value = coreContext.contactsManager.shouldDisplaySipContactsList()
coreContext.contactsManager.addListener(contactsUpdatedListener) coreContext.contactsManager.addListener(contactsUpdatedListener)
} }

4
app/src/main/java/org/linphone/contact/ContactsManager.kt
View file

@ -132,6 +132,10 @@ class ContactsManager(private val context: Context) {
) )
} }
fun shouldDisplaySipContactsList(): Boolean {
return coreContext.core.defaultProxyConfig?.identityAddress?.domain == corePreferences.defaultDomain
}
@Synchronized @Synchronized
fun fetchContactsAsync() { fun fetchContactsAsync() {
if (loadContactsTask != null) { if (loadContactsTask != null) {