MMS addresses can be email addresses

Fixes #6853
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-08-04 09:22:58 -07:00
parent f41e9c181c
commit 8de9261081

View File

@ -280,7 +280,7 @@ public class MmsDatabase extends MessagingDatabase {
PhoneNumberUtil.MatchType match; PhoneNumberUtil.MatchType match;
if (localNumber == null) match = PhoneNumberUtil.MatchType.NO_MATCH; if (localNumber == null) match = PhoneNumberUtil.MatchType.NO_MATCH;
else match = PhoneNumberUtil.getInstance().isNumberMatch(localNumber, cc.toPhoneString()); else match = PhoneNumberUtil.getInstance().isNumberMatch(localNumber, cc.serialize());
if (match == PhoneNumberUtil.MatchType.NO_MATCH || if (match == PhoneNumberUtil.MatchType.NO_MATCH ||
match == PhoneNumberUtil.MatchType.NOT_A_NUMBER) match == PhoneNumberUtil.MatchType.NOT_A_NUMBER)
@ -295,7 +295,7 @@ public class MmsDatabase extends MessagingDatabase {
PhoneNumberUtil.MatchType match; PhoneNumberUtil.MatchType match;
if (localNumber == null) match = PhoneNumberUtil.MatchType.NO_MATCH; if (localNumber == null) match = PhoneNumberUtil.MatchType.NO_MATCH;
else match = PhoneNumberUtil.getInstance().isNumberMatch(localNumber, to.toPhoneString()); else match = PhoneNumberUtil.getInstance().isNumberMatch(localNumber, to.serialize());
if (match == PhoneNumberUtil.MatchType.NO_MATCH || if (match == PhoneNumberUtil.MatchType.NO_MATCH ||
match == PhoneNumberUtil.MatchType.NOT_A_NUMBER) match == PhoneNumberUtil.MatchType.NOT_A_NUMBER)