TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-privatize getRecipientForNumber

Browse Source
This commit is contained in:
Jake McGinty 2014-02-17 20:19:35 -08:00
parent e15ff6193f
commit ca51ddac7f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/SingleContactSelectionActivity.java
View File

@ -94,16 +94,18 @@ public class SingleContactSelectionActivity extends PassphraseRequiredSherlockFr
private Recipients contactDataToRecipients(ContactData contactData) { private Recipients contactDataToRecipients(ContactData contactData) {
if (contactData == null || contactData.numbers == null) return null; 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) { for (ContactAccessor.NumberData numberData : contactData.numbers) {
if (NumberUtil.isValidSmsOrEmailOrGroup(numberData.number)) { if (NumberUtil.isValidSmsOrEmailOrGroup(numberData.number)) {
Recipient recipient = RecipientFactory.getRecipientForNumber(SingleContactSelectionActivity.this, try {
numberData.number, Recipients recipientsForNumber = RecipientFactory.getRecipientsFromString(SingleContactSelectionActivity.this,
false); numberData.number,
recipients.add(recipient); false);
recipients.getRecipientsList().addAll(recipientsForNumber.getRecipientsList());
} catch (RecipientFormattingException rfe) { }
} }
} }
return new Recipients(recipients); return recipients;
} }
private void openNewConversation(Recipients recipients) { private void openNewConversation(Recipients recipients) {

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

@ -51,7 +51,7 @@ public class RecipientFactory {
return new Recipients(results); 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); long recipientId = CanonicalAddressDatabase.getInstance(context).getCanonicalAddress(number);
return provider.getRecipient(context, recipientId, asynchronous); return provider.getRecipient(context, recipientId, asynchronous);
} }