gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2648 from nextcloud/bugfix/2647/fixNpeProcessAutocompleteUserList

Browse Source 
avoid NPE in processAutocompleteUserList
This commit is contained in:
Andy Scherzinger 2022-12-23 11:50:43 +01:00 committed by GitHub
commit 528deb1fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt
View File

@ -130,13 +130,12 @@ class ContactsController(args: Bundle) :
setHasOptionsMenu(true) setHasOptionsMenu(true)
sharedApplication!!.componentApplication.inject(this) sharedApplication!!.componentApplication.inject(this)
existingParticipants = ArrayList()
if (args.containsKey(BundleKeys.KEY_NEW_CONVERSATION)) { if (args.containsKey(BundleKeys.KEY_NEW_CONVERSATION)) {
isNewConversationView = true isNewConversationView = true
existingParticipants = ArrayList()
} else if (args.containsKey(BundleKeys.KEY_ADD_PARTICIPANTS)) { } else if (args.containsKey(BundleKeys.KEY_ADD_PARTICIPANTS)) {
isAddingParticipantsView = true isAddingParticipantsView = true
conversationToken = args.getString(BundleKeys.KEY_TOKEN) conversationToken = args.getString(BundleKeys.KEY_TOKEN)
existingParticipants = ArrayList()
if (args.containsKey(BundleKeys.KEY_EXISTING_PARTICIPANTS)) { if (args.containsKey(BundleKeys.KEY_EXISTING_PARTICIPANTS)) {
existingParticipants = args.getStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS) existingParticipants = args.getStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS)
} }
@ -497,8 +496,9 @@ class ContactsController(args: Bundle) :
val actorTypeConverter = EnumActorTypeConverter() val actorTypeConverter = EnumActorTypeConverter()
val newUserItemList: MutableList<AbstractFlexibleItem<*>> = ArrayList<AbstractFlexibleItem<*>>() val newUserItemList: MutableList<AbstractFlexibleItem<*>> = ArrayList<AbstractFlexibleItem<*>>()
for (autocompleteUser in autocompleteUsersList) { for (autocompleteUser in autocompleteUsersList) {
if (autocompleteUser.id != currentUser!!.userId && if (autocompleteUser.id != null &&
!existingParticipants!!.contains(autocompleteUser.id!!) autocompleteUser.id != currentUser!!.userId &&
!existingParticipants!!.contains(autocompleteUser.id)
) { ) {
participant = createParticipant(autocompleteUser, actorTypeConverter) participant = createParticipant(autocompleteUser, actorTypeConverter)
val headerTitle = getHeaderTitle(participant) val headerTitle = getHeaderTitle(participant)