gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-23 05:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1359 from nextcloud/bugfix/1314/attendeePinNPE

Browse Source 
Check if attendeePin exists
This commit is contained in:
Andy Scherzinger 2021-06-24 20:06:29 +02:00 committed by GitHub
commit 224c0b50a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -94,8 +94,8 @@ class ConversationInfoController(args: Bundle) :
R.layout.controller_conversation_info, R.layout.controller_conversation_info,
args args
), ),
FlexibleAdapter FlexibleAdapter.OnItemClickListener {
.OnItemClickListener {
private val binding: ControllerConversationInfoBinding by viewBinding(ControllerConversationInfoBinding::bind) private val binding: ControllerConversationInfoBinding by viewBinding(ControllerConversationInfoBinding::bind)
@Inject @Inject
@ -855,7 +855,7 @@ class ConversationInfoController(args: Bundle) :
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.APIv4, 1)) val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.APIv4, 1))
if (participant.getActorType() == USERS && participant.getActorId() == conversationUser!!.userId) { if (participant.getActorType() == USERS && participant.getActorId() == conversationUser!!.userId) {
if (participant.attendeePin.isNotEmpty()) { if (participant.attendeePin?.isNotEmpty() == true) {
val items = mutableListOf( val items = mutableListOf(
BasicListItemWithImage( BasicListItemWithImage(
R.drawable.ic_lock_grey600_24px, R.drawable.ic_lock_grey600_24px,
@ -948,7 +948,7 @@ class ConversationInfoController(args: Bundle) :
items.removeAt(1) items.removeAt(1)
} }
if (participant.attendeePin.isEmpty()) { if (participant.attendeePin == null || participant.attendeePin.isEmpty()) {
items.removeAt(0) items.removeAt(0)
} }
@ -959,7 +959,7 @@ class ConversationInfoController(args: Bundle) :
title(text = participant.displayName) title(text = participant.displayName)
listItemsWithImage(items = items) { dialog, index, _ -> listItemsWithImage(items = items) { dialog, index, _ ->
var actionToTrigger = index var actionToTrigger = index
if (participant.attendeePin.isEmpty()) { if (participant.attendeePin == null || participant.attendeePin.isEmpty()) {
actionToTrigger++ actionToTrigger++
} }
if (participant.type == Participant.ParticipantType.USER_FOLLOWING_LINK) { if (participant.type == Participant.ParticipantType.USER_FOLLOWING_LINK) {