re-privatize getRecipientForNumber

signalapp · Feb 18, 2014 · ca51dda · moxie0 · Feb 18, 2014 · mcginty
1 parent e15ff61
commit ca51dda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/org/thoughtcrime/securesms/SingleContactSelectionActivity.java b/src/org/thoughtcrime/securesms/SingleContactSelectionActivity.java
@@ -94,16 +94,18 @@ public void onRecipientsPanelUpdate(Recipients recipients) {
 
   private Recipients contactDataToRecipients(ContactData contactData) {
     if (contactData == null || contactData.numbers == null) return null;
-    List<Recipient> recipients = new ArrayList<Recipient>();
+    Recipients recipients = new Recipients(new ArrayList<Recipient>());
     for (ContactAccessor.NumberData numberData : contactData.numbers) {
       if (NumberUtil.isValidSmsOrEmailOrGroup(numberData.number)) {
-        Recipient recipient = RecipientFactory.getRecipientForNumber(SingleContactSelectionActivity.this,
-            numberData.number,
-            false);
-        recipients.add(recipient);
+        try {
+          Recipients recipientsForNumber = RecipientFactory.getRecipientsFromString(SingleContactSelectionActivity.this,
+              numberData.number,
+              false);
+          recipients.getRecipientsList().addAll(recipientsForNumber.getRecipientsList());
+        } catch (RecipientFormattingException rfe) { }
       }
     }
-    return new Recipients(recipients);
+    return recipients;
   }
 
   private void openNewConversation(Recipients recipients) {

diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientFactory.java b/src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
@@ -51,7 +51,7 @@ public static Recipients getRecipientsForIds(Context context, String recipientId
     return new Recipients(results);
   }
 
-  public static Recipient getRecipientForNumber(Context context, String number, boolean asynchronous) {
+  private static Recipient getRecipientForNumber(Context context, String number, boolean asynchronous) {
     long recipientId = CanonicalAddressDatabase.getInstance(context).getCanonicalAddress(number);
     return provider.getRecipient(context, recipientId, asynchronous);
   }