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

Fixed display issue when creating 1-1 encrypted chat rooms

Browse source
This commit is contained in:
Sylvain Berfini 2021-01-18 17:30:52 +01:00
parent 1d20314726
commit 886f225016
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
View file

@ -122,11 +122,15 @@ class ChatMessagesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
} }
override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) { override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) {
addEvent(eventLog) if (!chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
addEvent(eventLog)
}
} }
override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) { override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) {
addEvent(eventLog) if (!chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
addEvent(eventLog)
}
} }
override fun onEphemeralMessageDeleted(chatRoom: ChatRoom, eventLog: EventLog) { override fun onEphemeralMessageDeleted(chatRoom: ChatRoom, eventLog: EventLog) {

16
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
View file

@ -45,14 +45,15 @@ class ChatRoomViewModelFactory(private val chatRoom: ChatRoom) :
class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactViewModelInterface { class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactViewModelInterface {
override val contact = MutableLiveData<Contact>() override val contact = MutableLiveData<Contact>()
override val displayName: String by lazy { override val displayName: String
when { get() {
chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) -> LinphoneUtils.getDisplayName(chatRoom.peerAddress) return when {
chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) -> LinphoneUtils.getDisplayName(chatRoom.participants.firstOrNull()?.address ?: chatRoom.peerAddress) chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) -> LinphoneUtils.getDisplayName(chatRoom.peerAddress)
chatRoom.hasCapability(ChatRoomCapabilities.Conference.toInt()) -> chatRoom.subject.orEmpty() chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) -> LinphoneUtils.getDisplayName(chatRoom.participants.firstOrNull()?.address ?: chatRoom.peerAddress)
else -> chatRoom.peerAddress.asStringUriOnly() chatRoom.hasCapability(ChatRoomCapabilities.Conference.toInt()) -> chatRoom.subject.orEmpty()
else -> chatRoom.peerAddress.asStringUriOnly()
}
} }
}
override val securityLevel: ChatRoomSecurityLevel override val securityLevel: ChatRoomSecurityLevel
get() = chatRoom.securityLevel get() = chatRoom.securityLevel
@ -172,6 +173,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactViewModelI
override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) { override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) {
contactLookup() contactLookup()
updateSecurityIcon() updateSecurityIcon()
subject.value = chatRoom.subject
} }
override fun onSecurityEvent(chatRoom: ChatRoom, eventLog: EventLog) { override fun onSecurityEvent(chatRoom: ChatRoom, eventLog: EventLog) {