diff --git a/src/org/thoughtcrime/securesms/service/SmsListener.java b/src/org/thoughtcrime/securesms/service/SmsListener.java index cdac5f29a..990629128 100644 --- a/src/org/thoughtcrime/securesms/service/SmsListener.java +++ b/src/org/thoughtcrime/securesms/service/SmsListener.java @@ -41,7 +41,7 @@ public class SmsListener extends BroadcastReceiver { private static final String SMS_RECEIVED_ACTION = Telephony.Sms.Intents.SMS_RECEIVED_ACTION; private static final String SMS_DELIVERED_ACTION = Telephony.Sms.Intents.SMS_DELIVER_ACTION; - private static final Pattern CHALLENGE_PATTERN = Pattern.compile(".*Your (Signal|TextSecure) verification code: ([0-9]{3,4})-([0-9]{3,4}).*", Pattern.DOTALL); + private static final Pattern CHALLENGE_PATTERN = Pattern.compile(".*Your (Signal|TextSecure) verification code:? ([0-9]{3,4})-([0-9]{3,4}).*", Pattern.DOTALL); private boolean isExemption(SmsMessage message, String messageBody) { diff --git a/test/unitTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java b/test/unitTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java index 8ae403347..6f16602cc 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java +++ b/test/unitTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java @@ -24,6 +24,7 @@ public class SmsListenerTest extends BaseUnitTest { put("Your TextSecure verification code: 1337-1337", "13371337"); put("XXXYour TextSecure verification code: 1337-1337", "13371337"); put("Your TextSecure verification code: 1337-1337XXX", "13371337"); + put("Your TextSecure verification code 1337-1337", "13371337"); put("Your Signal verification code: 337-337", "337337"); put("XXX\nYour Signal verification code: 1337-1337", "13371337"); @@ -32,6 +33,7 @@ public class SmsListenerTest extends BaseUnitTest { put("Your Signal verification code: 1337-1337", "13371337"); put("XXXYour Signal verification code: 1337-1337", "13371337"); put("Your Signal verification code: 1337-1337XXX", "13371337"); + put("Your Signal verification code 1337-1337", "13371337"); }}; private SmsListener listener;