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

stop sync resolution of recipients on ui thread

Browse Source 
Closes #3885
// FREEBIE
This commit is contained in:
Jake McGinty 2015-08-04 17:40:19 -07:00 committed by Moxie Marlinspike
parent 151eca971b
commit 00eb637e51
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@ -1099,13 +1099,13 @@ public class MmsDatabase extends MessagingDatabase {
private Recipients getRecipientsFor(String address) { private Recipients getRecipientsFor(String address) {
if (TextUtils.isEmpty(address) || address.equals("insert-address-token")) { if (TextUtils.isEmpty(address) || address.equals("insert-address-token")) {
return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), false); return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), true);
} }
Recipients recipients = RecipientFactory.getRecipientsFromString(context, address, false); Recipients recipients = RecipientFactory.getRecipientsFromString(context, address, true);
if (recipients == null || recipients.isEmpty()) { if (recipients == null || recipients.isEmpty()) {
return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), false); return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), true);
} }
return recipients; return recipients;

6
src/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@ -608,16 +608,16 @@ public class SmsDatabase extends MessagingDatabase {
private Recipients getRecipientsFor(String address) { private Recipients getRecipientsFor(String address) {
if (address != null) { if (address != null) {
Recipients recipients = RecipientFactory.getRecipientsFromString(context, address, false); Recipients recipients = RecipientFactory.getRecipientsFromString(context, address, true);
if (recipients == null || recipients.isEmpty()) { if (recipients == null || recipients.isEmpty()) {
return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), false); return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), true);
} }
return recipients; return recipients;
} else { } else {
Log.w(TAG, "getRecipientsFor() address is null"); Log.w(TAG, "getRecipientsFor() address is null");
return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), false); return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(), true);
} }
} }