blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for occasional NPE

master
Moxie Marlinspike 2012-11-30 19:48:48 -08:00
parent 575341704e
commit 0e5ff9bdac
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
View File

@ -25,10 +25,11 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.util.NumberUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@ -54,8 +55,11 @@ public class RecipientFactory {
}
public static Recipients getRecipientsForIds(Context context, String recipientIds) {
ArrayList<Recipient> results = new ArrayList<Recipient>();
StringTokenizer tokenizer = new StringTokenizer(recipientIds.trim(), " ");
if (recipientIds == null || recipientIds.trim().length() == 0)
return new Recipients(new LinkedList<Recipient>());
List<Recipient> results = new LinkedList<Recipient>();
StringTokenizer tokenizer = new StringTokenizer(recipientIds.trim(), " ");
while (tokenizer.hasMoreTokens()) {
String recipientId = tokenizer.nextToken();
@ -87,8 +91,8 @@ public class RecipientFactory {
}
public static Recipients getRecipientsFromString(Context context, String rawText) throws RecipientFormattingException {
ArrayList<Recipient> results = new ArrayList<Recipient>();
StringTokenizer tokenizer = new StringTokenizer(rawText, ",");
List<Recipient> results = new LinkedList<Recipient>();
StringTokenizer tokenizer = new StringTokenizer(rawText, ",");
while (tokenizer.hasMoreTokens()) {
Recipient recipient = parseRecipient(context, tokenizer.nextToken());