TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-22 20:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly return unknown recipient from SMS db on empty.

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-05-21 10:23:27 -07:00
parent 018f5eccf3
commit 3df67a1643
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,7 +434,14 @@ public class SmsDatabase extends Database implements MmsSmsColumns {
private Recipients getRecipientsFor(String address) { private Recipients getRecipientsFor(String address) {
try { try {
return RecipientFactory.getRecipientsFromString(context, address, false); Recipients recipients = RecipientFactory.getRecipientsFromString(context, address, false);
if (recipients == null || recipients.isEmpty()) {
return new Recipients(new Recipient("Unknown", "Unknown", null,
ContactPhotoFactory.getDefaultContactPhoto(context)));
}
return recipients;
} catch (RecipientFormattingException e) { } catch (RecipientFormattingException e) {
Log.w("EncryptingSmsDatabase", e); Log.w("EncryptingSmsDatabase", e);
return new Recipients(new Recipient("Unknown", "Unknown", null, return new Recipients(new Recipient("Unknown", "Unknown", null,

10
src/org/thoughtcrime/securesms/recipients/Recipients.java
View File

@ -64,11 +64,11 @@ public class Recipients implements Parcelable {
this.recipients.addAll(recipients.getRecipientsList()); this.recipients.addAll(recipients.getRecipientsList());
} }
public Recipients truncateToSingleRecipient() { // public Recipients truncateToSingleRecipient() {
assert(!this.recipients.isEmpty()); // assert(!this.recipients.isEmpty());
this.recipients = this.recipients.subList(0, 1); // this.recipients = this.recipients.subList(0, 1);
return this; // return this;
} // }
public void addListener(RecipientModifiedListener listener) { public void addListener(RecipientModifiedListener listener) {
for (Recipient recipient : recipients) { for (Recipient recipient : recipients) {