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

Fixed build with latest SDK + fix zrtp SAS display issue

Browse source
This commit is contained in:
Sylvain Berfini 2020-12-09 16:39:35 +01:00
parent 8950a88c8d
commit dd8e8d57bb
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactViewModelI
val oneParticipantOneDevice: Boolean val oneParticipantOneDevice: Boolean
get() { get() {
return chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && return chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) &&
chatRoom.me.devices.size == 1 && chatRoom.me?.devices?.size == 1 &&
chatRoom.participants.first().devices.size == 1 chatRoom.participants.first().devices.size == 1
} }

3
app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt
View file

@ -68,7 +68,8 @@ class DevicesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
private fun updateParticipants() { private fun updateParticipants() {
val list = arrayListOf<DevicesListGroupViewModel>() val list = arrayListOf<DevicesListGroupViewModel>()
list.add(DevicesListGroupViewModel(chatRoom.me)) val me = chatRoom.me
if (me != null) list.add(DevicesListGroupViewModel(me))
for (participant in chatRoom.participants) { for (participant in chatRoom.participants) {
list.add(DevicesListGroupViewModel(participant)) list.add(DevicesListGroupViewModel(participant))
} }

4
app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
View file

@ -92,7 +92,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() {
init { init {
subject.value = chatRoom?.subject subject.value = chatRoom?.subject
isMeAdmin.value = chatRoom == null || (chatRoom.me.isAdmin && !chatRoom.hasBeenLeft()) isMeAdmin.value = chatRoom == null || (chatRoom.me?.isAdmin == true && !chatRoom.hasBeenLeft())
canLeaveGroup.value = chatRoom != null && !chatRoom.hasBeenLeft() canLeaveGroup.value = chatRoom != null && !chatRoom.hasBeenLeft()
isEncrypted.value = chatRoom?.hasCapability(ChatRoomCapabilities.Encrypted.toInt()) isEncrypted.value = chatRoom?.hasCapability(ChatRoomCapabilities.Encrypted.toInt())
@ -165,7 +165,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() {
if (participant != null) { if (participant != null) {
// Participant found, check if admin status needs to be updated // Participant found, check if admin status needs to be updated
if (member.isAdmin != participant.isAdmin) { if (member.isAdmin != participant.isAdmin) {
if (chatRoom.me.isAdmin) { if (chatRoom.me?.isAdmin == true) {
Log.i("[Chat Room Group Info] Participant ${member.address.asStringUriOnly()} will be admin? ${member.isAdmin}") Log.i("[Chat Room Group Info] Participant ${member.address.asStringUriOnly()} will be admin? ${member.isAdmin}")
chatRoom.setParticipantAdminStatus(participant, member.isAdmin) chatRoom.setParticipantAdminStatus(participant, member.isAdmin)
} }

4
app/src/main/res/layout/dialog.xml
View file

@ -57,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -80,7 +80,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"