From 442f56cdc363b89642fa326ffd7716d3eb5d08d2 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Thu, 12 Feb 2015 13:34:40 -0800 Subject: [PATCH] prevent NPE in GroupCreateActivity Occurs when a returned Recipient is null when returning from contact selection activity. Fixes #2466 // FREEBIE --- src/org/thoughtcrime/securesms/GroupCreateActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index eee91811b7..d59d97b0df 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -387,8 +387,9 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity { Recipient recipient = RecipientFactory.getRecipientsFromString(this, numberData.number, false) .getPrimaryRecipient(); - if (!selectedContacts.contains(recipient) - && (existingContacts == null || !existingContacts.contains(recipient))) { + if (!selectedContacts.contains(recipient) && + (existingContacts == null || !existingContacts.contains(recipient)) && + recipient != null) { addSelectedContact(recipient); } } catch (RecipientFormattingException e) {