From 472179b5500ca5e26c74b8d4f1fce1aec1872eea Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Wed, 25 Mar 2015 08:57:08 -0700 Subject: [PATCH] Ignores MMS WAP_PUSH_DELIVER_ACTION if we're not the default app. Apparently some ROMs have a bug where they broadcast WAP_PUSH_DELIVER_ACTION even when you're not the system's default SMS/MMS app. Fixes #2777 --- src/org/thoughtcrime/securesms/service/MmsListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/service/MmsListener.java b/src/org/thoughtcrime/securesms/service/MmsListener.java index b679d4c641..151c7f959e 100644 --- a/src/org/thoughtcrime/securesms/service/MmsListener.java +++ b/src/org/thoughtcrime/securesms/service/MmsListener.java @@ -77,7 +77,8 @@ public class MmsListener extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { Log.w("MmsListener", "Got MMS broadcast..." + intent.getAction()); - if (Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION.equals(intent.getAction()) || + if ((Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION.equals(intent.getAction()) && + Util.isDefaultSmsProvider(context)) || (Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION.equals(intent.getAction()) && isRelevant(context, intent))) {