TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent NPE in GroupCreateActivity

Browse Source 
Occurs when a returned Recipient is null when returning from contact
selection activity.

Fixes #2466
// FREEBIE
This commit is contained in:
Jake McGinty 2015-02-12 13:34:40 -08:00
parent 35dabaf1e5
commit 442f56cdc3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/GroupCreateActivity.java
View File

@ -387,8 +387,9 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity {
Recipient recipient = RecipientFactory.getRecipientsFromString(this, numberData.number, false) Recipient recipient = RecipientFactory.getRecipientsFromString(this, numberData.number, false)
.getPrimaryRecipient(); .getPrimaryRecipient();
if (!selectedContacts.contains(recipient) if (!selectedContacts.contains(recipient) &&
&& (existingContacts == null || !existingContacts.contains(recipient))) { (existingContacts == null || !existingContacts.contains(recipient)) &&
recipient != null) {
addSelectedContact(recipient); addSelectedContact(recipient);
} }
} catch (RecipientFormattingException e) { } catch (RecipientFormattingException e) {