Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-03 07:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for per-recipient muting, blocking, and ringtones.

Browse Source 
Fixes #757
Fixes #354
Fixes #222
Closes #1815
Closes #3378

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-06-09 07:37:20 -07:00
parent cb3cf7789f
commit 40af2a81db
80 changed files with 1858 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,7 +345,7 @@ public class MmsDatabase extends MessagingDatabase {
? Util.toIsoString(notification.getFrom().getTextString())
: "";
Recipients recipients = RecipientFactory.getRecipientsFromString(context, fromString, false);
if (recipients.isEmpty()) recipients = new Recipients(Recipient.getUnknownRecipient(context));
if (recipients.isEmpty()) recipients = RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(context), false);
return DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipients);
}
@@ -1054,13 +1054,13 @@ public class MmsDatabase extends MessagingDatabase {
private Recipients getRecipientsFor(String address) {
if (TextUtils.isEmpty(address) || address.equals("insert-address-token")) {
return new Recipients(Recipient.getUnknownRecipient(context));
return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(context), false);
}
Recipients recipients = RecipientFactory.getRecipientsFromString(context, address, false);
if (recipients == null || recipients.isEmpty()) {
return new Recipients(Recipient.getUnknownRecipient(context));
return RecipientFactory.getRecipientsFor(context, Recipient.getUnknownRecipient(context), false);
}
return recipients;