empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ignore inbound SMS/MMS from yourself.

Browse source
This commit is contained in:
Greyson Parrelli 2022-03-29 18:29:46 -04:00
parent 348b6e9742
commit c7a345eb0b
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
View file

@ -71,7 +71,11 @@ public class MmsReceiveJob extends BaseJob {
Log.w(TAG, e); Log.w(TAG, e);
} }
if (isNotification(pdu) && !isBlocked(pdu)) { if (isNotification(pdu) && isBlocked(pdu)) {
Log.w(TAG, "Received an MMS from a blocked user. Ignoring.");
} else if (isNotification(pdu) && isSelf(pdu)) {
Log.w(TAG, "Received an MMS from ourselves! Ignoring.");
} else if (isNotification(pdu)) {
MessageDatabase database = SignalDatabase.mms(); MessageDatabase database = SignalDatabase.mms();
Pair<Long, Long> messageAndThreadId = database.insertMessageInbox((NotificationInd)pdu, subscriptionId); Pair<Long, Long> messageAndThreadId = database.insertMessageInbox((NotificationInd)pdu, subscriptionId);
@ -80,8 +84,8 @@ public class MmsReceiveJob extends BaseJob {
ApplicationDependencies.getJobManager().add(new MmsDownloadJob(messageAndThreadId.first(), ApplicationDependencies.getJobManager().add(new MmsDownloadJob(messageAndThreadId.first(),
messageAndThreadId.second(), messageAndThreadId.second(),
true)); true));
} else if (isNotification(pdu)) { } else {
Log.w(TAG, "*** Received blocked MMS, ignoring..."); Log.w(TAG, "Unable to process MMS.");
} }
} }
@ -104,6 +108,15 @@ public class MmsReceiveJob extends BaseJob {
return false; return false;
} }
private boolean isSelf(GenericPdu pdu) {
if (pdu.getFrom() != null && pdu.getFrom().getTextString() != null) {
Recipient recipients = Recipient.external(context, Util.toIsoString(pdu.getFrom().getTextString()));
return recipients.isSelf();
}
return false;
}
private boolean isNotification(GenericPdu pdu) { private boolean isNotification(GenericPdu pdu) {
return pdu != null && pdu.getMessageType() == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND; return pdu != null && pdu.getMessageType() == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
} }

8
app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
View file

@ -117,16 +117,18 @@ public class SmsReceiveJob extends BaseJob {
} }
} }
if (message.isPresent() && !isBlocked(message.get())) { if (message.isPresent() && SignalStore.account().getE164() != null && message.get().getSender().equals(Recipient.self().getId())) {
Log.w(TAG, "Received an SMS from ourselves! Ignoring.");
} else if (message.isPresent() && !isBlocked(message.get())) {
Optional<InsertResult> insertResult = storeMessage(message.get()); Optional<InsertResult> insertResult = storeMessage(message.get());
if (insertResult.isPresent()) { if (insertResult.isPresent()) {
ApplicationDependencies.getMessageNotifier().updateNotification(context, insertResult.get().getThreadId()); ApplicationDependencies.getMessageNotifier().updateNotification(context, insertResult.get().getThreadId());
} }
} else if (message.isPresent()) { } else if (message.isPresent()) {
Log.w(TAG, "*** Received blocked SMS, ignoring..."); Log.w(TAG, "Received an SMS from a blocked user. Ignoring.");
} else { } else {
Log.w(TAG, "*** Failed to assemble message fragments!"); Log.w(TAG, "Failed to assemble message fragments!");
} }
} }