From dd8e8d57bb5bbfb4af8c7ff130b8070cb8f3157f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 9 Dec 2020 16:39:35 +0100 Subject: [PATCH] Fixed build with latest SDK + fix zrtp SAS display issue --- .../activities/main/chat/viewmodels/ChatRoomViewModel.kt | 2 +- .../activities/main/chat/viewmodels/DevicesListViewModel.kt | 3 ++- .../activities/main/chat/viewmodels/GroupInfoViewModel.kt | 4 ++-- app/src/main/res/layout/dialog.xml | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt index ec6a5e214..ac5c4c1e2 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt @@ -95,7 +95,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactViewModelI val oneParticipantOneDevice: Boolean get() { return chatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && - chatRoom.me.devices.size == 1 && + chatRoom.me?.devices?.size == 1 && chatRoom.participants.first().devices.size == 1 } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt index cb47fbb64..fa31ee0b9 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/DevicesListViewModel.kt @@ -68,7 +68,8 @@ class DevicesListViewModel(private val chatRoom: ChatRoom) : ViewModel() { private fun updateParticipants() { val list = arrayListOf() - list.add(DevicesListGroupViewModel(chatRoom.me)) + val me = chatRoom.me + if (me != null) list.add(DevicesListGroupViewModel(me)) for (participant in chatRoom.participants) { list.add(DevicesListGroupViewModel(participant)) } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt index adaf0908b..4dec5d79c 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt @@ -92,7 +92,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() { init { 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() isEncrypted.value = chatRoom?.hasCapability(ChatRoomCapabilities.Encrypted.toInt()) @@ -165,7 +165,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() { if (participant != null) { // Participant found, check if admin status needs to be updated 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}") chatRoom.setParticipantAdminStatus(participant, member.isAdmin) } diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml index 1e482e18b..4ffc0a359 100644 --- a/app/src/main/res/layout/dialog.xml +++ b/app/src/main/res/layout/dialog.xml @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:orientation="horizontal"> + android:orientation="vertical"> + android:orientation="vertical">